[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class - #6456

Merged
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path
Jun 16, 2020
Merged

[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data class#6456
wing328 merged 36 commits into
OpenAPITools:masterfrom
kuFEAR:kotlin_client_fix_list_and_fix_retrofit_path

Conversation

@kuFEAR

@kuFEARkuFEAR commented May 27, 2020

Copy link
Copy Markdown
Contributor

I got some fixes from PR #5697

  1. Fix url path for Retrofit
  2. Fix optionals for @query@Body in requests
  3. Set List as default collection for Kotlin data class, because data classes require override hashCode and equals methods
  4. Small template formatting improvement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.
    @4brunu@wing328@ch4rl3x

@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data ClassMay 27, 2020
@kuFEARkuFEAR changed the title [Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Replace Array with ArrayList for Kotlin Data Class[Kotlin][Client] Fix url path for Retrofit, Fix optionals for @Query @Body, Set List as default collection for Kotlin data classMay 27, 2020
@4brunu

Copy link
Copy Markdown
Contributor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

Can you please fix those tests?

e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (25, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (27, 28): Type inference failed. Expected type mismatch: inferred type is Array<Tag> but List<Tag>? was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (47, 47): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (55, 48): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/PetApiTest.kt: (66, 33): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected
e: /root/src/github.com/OpenAPITools/openapi-generator/samples/client/petstore/kotlin/src/test/kotlin/org/openapitools/client/StoreApiTest.kt: (21, 29): Type inference failed. Expected type mismatch: inferred type is Array<String> but List<String> was expected

The PR is very big, because it changes a lot of things in the sample projects.
But it looks good.

ff3f63d but when I run test locally it failed with com.squareup.moshi.LinkedHashTreeMap cannot be cast to org.openapitools.client.models.Pet

@kuFEAR

kuFEAR commented May 28, 2020

Copy link
Copy Markdown
ContributorAuthor

The PR is very big

yeah, every time when changed some basic template we should update all kotlin-* scripts)

kuFEAR added 3 commits June 5, 2020 10:29
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

@wing328 Are you planning to merge #6585 and this PR into 5.0.0?

kuFEAR added 6 commits June 11, 2020 19:03
…fix_list_and_fix_retrofit_path
# Conflicts:
#	samples/client/petstore/kotlin-retrofit2/docs/PetApi.md
#	samples/client/petstore/kotlin-retrofit2/docs/UserApi.md
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/PetApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/UserApi.md
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
#	samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

after merging ccb5ae7 when I ran generate-samples.sh for kotlin* I don't have changes as on circleCI like:

-@Api(value = "Pet", description = "The Pet API")
+@Api(value = "pet", description = "The pet API")

on my branch it still generate with as "Pet"
@4brunu@wing328 any idea how to fix it?

@wing328

Copy link
Copy Markdown
Member

CC @jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

@wing328

Copy link
Copy Markdown
Member

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

@kuFEAR

Copy link
Copy Markdown
ContributorAuthor

I've merged the latest master and update the Kotlin samples. Let's see how it goes.

now I saw https://app.circleci.com/pipelines/github/OpenAPITools/openapi-generator/3497/workflows/345773ae-ab74-4162-a8c5-1592ae010e4f/jobs/16865/parallel-runs/2?filterBy=FAILED there a lot not related with kotlin uncommited changes, go/apex/java-google-api

@wing328

Copy link
Copy Markdown
Member

Not sure how but some of your changes update apex, go, etc petstore samples. I've pushed another update by updating all samples. Let's see how it goes.

@wing328

Copy link
Copy Markdown
Member

If no further question/feedback on this PR, I'll merge it tomorrow (Tuesday)

@wing328
wing328 merged commit 53eff43 into OpenAPITools:masterJun 16, 2020
@wing328wing328 added this to the 5.0.0 milestone Jul 3, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@kuFEAR@4brunu@wing328