Update HttpRequest.cpp.mustache - use stable 4-parameter connect #18893

Jazzco · 2024-06-10T12:35:10Z

The 3-parameter connect is known to cause issues when the creating instance is deleted. In all other mustache you already use stable 4-parameter connect. In HttpRequest.cpp.mustache the fix was missing.

PR checklist

Read the contribution guidelines.
Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
Run the following to build the project and update samples:
```
./mvnw clean package 
./bin/generate-samples.sh ./bin/configs/*.yaml
./bin/utils/export_docs_generators.sh
```
(For Windows users, please run the script in Git BASH)
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
File the PR against the correct branch: master (upcoming 7.6.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

Use stable 4-parameter connect

wing328 · 2024-06-11T12:04:55Z

thanks for the PR. please follow step 3 to update the samples.

cc @ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @MartinDelille (2018/03) @muttleyxd (2019/08)

muttleyxd

Looks good, please do the step 3 though

Jazzco · 2024-06-11T13:52:48Z

I ran the parts of step 3, committed and pushed. Put I don't see a hint that these changes came in. Any hint what might went wrong?

Jazzco · 2024-06-11T13:56:01Z

Ah wait - I pushed to my master .... need to push to patch-1

Jazzco · 2024-06-12T07:56:35Z

Reviewing the changes I see a lot of path separator changes, obviously because I ran mvn and the scripts on Windows. Is that really what you want?

MartinDelille

Yes please push only the change regarding HttpRequest please!

wing328 · 2024-06-12T15:26:14Z

@muttleyxd @MartinDelille when you guys have time, can you please PM me via Slack? Thanks.

This reverts commit 1d4e78a.

Jazzco · 2024-06-13T15:32:33Z

Yes please push only the change regarding HttpRequest please!

As far as I see there is nothing changed but the manual change in HttpRequest, as long as the shifted entries of ApiException.php and readme.MD are irrelevant.

From a Windows user perspective the script I was asked to follow in step 3 is unusable in this state. Maybe it should be extended to replace all CR/LF by single LF.

I don't have the time to dig into it but the git bash seems to have commands for this:

find . -name "*.java" -exec dos2unix {} \;

wing328 · 2024-06-15T10:47:31Z

@Jazzco tests with updated samples failed: https://github.com/OpenAPITools/openapi-generator/actions/runs/9527512386/job/26264196606?pr=18939

can you please review the test failure when you've time?

Jazzco · 2024-06-17T09:39:16Z

@Jazzco tests with updated samples failed: https://github.com/OpenAPITools/openapi-generator/actions/runs/9527512386/job/26264196606?pr=18939

can you please review the test failure when you've time?

@wing328 I reviewed the change and don't see what could cause the issue. As mentioned above, step 3 produces many line break changes when processed on Windows, so I reverted it. Maybe I oversaw a generated change that was necessary but I guess it makes way more sense to run this script on Linux in the current state.

Locally generating our api and patching the results with these two changes afterwards works fine.

@ravinikam (2017/07) @stkrwork (2017/07) @etherealjoy (2018/02) @MartinDelille (2018/03) @muttleyxd (2019/08)
Could one of you please take over this tiny change? And maybe trigger your scripting team to fix the linefeed-issue

Regards
Jazzco

MartinDelille · 2024-06-17T15:11:49Z

@muttleyxd @MartinDelille when you guys have time, can you please PM me via Slack? Thanks.

I sent you an email!

…tion (see warning [clazy-connect-3arg-lambda])

Jazzco · 2024-06-18T09:28:04Z

I noticed that there were some other [clazy-connect-3arg-lambda] warnings, this time in api-body, and fixed them, too.

Jazzco · 2024-06-18T13:06:25Z

To get this right I ran step 3 from a Linux vm and pushed the generated changes now.

Jazzco · 2024-06-18T14:21:19Z

I tested these changes using Qt 5.15.2 on Windows. There were no compilation or link errors.

…tch-1

Jazzco · 2024-06-18T14:43:05Z

There were () missing and it obviously worked with the 3 param version but failed with the 4 param version under macOS. Hopefully it builds now.

MartinDelille

Thank you so much for your contribution!

wing328 · 2024-06-19T05:11:36Z

the CI tests failed: https://github.com/OpenAPITools/openapi-generator/actions/runs/9567139672/job/26402928612?pr=18893

please take a look when you've time.

wing328 · 2024-07-08T11:00:43Z

@Jazzco please pull the latest master into your branch when you've time

MartinDelille · 2024-07-18T14:01:25Z

@wing328 not sure the CI was triggered properly. Can you restart it by hand ?

wing328 · 2024-07-18T16:58:20Z

https://github.com/OpenAPITools/openapi-generator/actions/runs/9954301257/job/27620131137?pr=18893

please update the samples one more time

Jazzco · 2024-07-25T15:47:01Z

updated again

MartinDelille · 2024-07-26T08:13:58Z

@Jazzco can you make sure you have regenerated the sample accordingly ?

Jazzco · 2024-07-26T10:05:43Z

@Jazzco can you make sure you have regenerated the sample accordingly ?

done

MartinDelille · 2024-07-29T09:38:08Z

@wing328 It looks like the CI wasnt' triggered properly. Any idea why ?

Jazzco · 2024-08-05T07:27:17Z

There was a timeout warning. Maybe some resources were busy. I merged master in again to trigger a rebuild.

Jazzco · 2024-08-05T07:29:33Z

Looks better now

…-body.mustache Co-authored-by: Martin Delille <martin@delille.org>

Jazzco · 2024-08-05T12:47:51Z

Now it complains in "Samples up-to-date" but I did update the samples, all 3 steps.

wing328 · 2024-08-05T13:18:10Z

Now it complains in "Samples up-to-date" but I did update the samples, all 3 steps.

did you do clean (e.g. mvn clean package) when rebuilding the jar?

Jazzco · 2024-08-05T13:40:28Z

did you do clean (e.g. mvn clean package) when rebuilding the jar?

Yes, all 3 steps: mvn clean, generate samples, and generate docs

Jazzco · 2024-08-05T13:41:41Z

Also repeated the steps and git states there's nothing to commit.

MartinDelille · 2024-08-07T08:02:03Z

@Jazzco Since #19297 introduced a new configuration, you should probably merge master and retry the generation to fix this errors.

Jazzco · 2024-08-21T11:36:08Z

Looks stable now, doesn't it?

MartinDelille

Sorry I was back from vacation yesterday. I see only one last issue with your changes (see other comment).

MartinDelille · 2024-09-03T14:49:27Z

samples/client/echo_api/php-nextgen-streaming/src/ObjectSerializer.php

+        // https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#style-values
+        if ($openApiType === 'array' && $style === 'deepObject' && $explode) {
+            return $value;
+        }


This change looks like to be not related to the PR.

Yes, that's not my code. How did it come in? What am I supposed to do now?

An easy fix would be just to remove it. Check there is no difference with master using git diff martin...patch-1 before committing.

Update HttpRequest.cpp.mustache

1afbc5e

Use stable 4-parameter connect

muttleyxd approved these changes Jun 11, 2024

View reviewed changes

wing328 added Client: C++ Enhancement: General labels Jun 11, 2024

wing328 added this to the 7.7.0 milestone Jun 11, 2024

add generated files

1d4e78a

MartinDelille suggested changes Jun 12, 2024

View reviewed changes

Revert "add generated files"

edcf3d5

This reverts commit 1d4e78a.

wing328 mentioned this pull request Jun 15, 2024

Jazzco patch 1 #18939

Draft

5 tasks

changed from 3- to 4-parameter connect for api-body for stable connec…

ca9abb8

…tion (see warning [clazy-connect-3arg-lambda])

Jazzco and others added 2 commits June 18, 2024 13:56

Merge branch 'OpenAPITools:master' into patch-1

d647327

ran step 3 from Linux

6f0b374

Jazzco added 3 commits June 18, 2024 16:31

fixed missing braces and additional 3par issues

f863876

Merge branch 'patch-1' of github.com:Jazzco/openapi-generator into pa…

f1a5215

…tch-1

add step 3 generated file

e0659d4

MartinDelille approved these changes Jun 18, 2024

View reviewed changes

Merge branch 'OpenAPITools:master' into patch-1

898b52a

Jazzco added 2 commits July 19, 2024 09:20

Merge branch 'OpenAPITools:master' into patch-1

b1f3b18

Merge branch 'OpenAPITools:master' into patch-1

209600d

rebuild examples

6a2f2ee

Merge branch 'master' into patch-1

2c39e6f

Jazzco and others added 2 commits August 5, 2024 11:33

Update modules/openapi-generator/src/main/resources/cpp-qt-client/api…

c7e3b77

…-body.mustache Co-authored-by: Martin Delille <martin@delille.org>

removed braces and updated examples

24d6c67

Jazzco and others added 2 commits August 7, 2024 11:25

Merge branch 'OpenAPITools:master' into patch-1

86d5104

rebuild samples

d954acb

wing328 modified the milestones: 7.8.0, 8.0.0 Aug 18, 2024

MartinDelille suggested changes Sep 3, 2024

View reviewed changes

Jazzco and others added 2 commits September 4, 2024 07:21

remove false generated changes

fe5315a

Merge branch 'OpenAPITools:master' into patch-1

c8985f8

MartinDelille approved these changes Sep 4, 2024

View reviewed changes

Update HttpRequest.cpp.mustache - use stable 4-parameter connect #18893

Are you sure you want to change the base?

Update HttpRequest.cpp.mustache - use stable 4-parameter connect #18893

Conversation

Jazzco commented Jun 10, 2024 • edited Loading

PR checklist

wing328 commented Jun 11, 2024

muttleyxd left a comment

Choose a reason for hiding this comment

Jazzco commented Jun 11, 2024

Jazzco commented Jun 11, 2024

Jazzco commented Jun 12, 2024

MartinDelille left a comment

Choose a reason for hiding this comment

wing328 commented Jun 12, 2024

Jazzco commented Jun 13, 2024 • edited Loading

wing328 commented Jun 15, 2024

Jazzco commented Jun 17, 2024 • edited Loading

MartinDelille commented Jun 17, 2024

Jazzco commented Jun 18, 2024

Jazzco commented Jun 18, 2024

Jazzco commented Jun 18, 2024

Jazzco commented Jun 18, 2024

MartinDelille left a comment

Choose a reason for hiding this comment

wing328 commented Jun 19, 2024

wing328 commented Jul 8, 2024

MartinDelille commented Jul 18, 2024

wing328 commented Jul 18, 2024

Jazzco commented Jul 25, 2024

MartinDelille commented Jul 26, 2024

Jazzco commented Jul 26, 2024

MartinDelille commented Jul 29, 2024

Jazzco commented Aug 5, 2024

Jazzco commented Aug 5, 2024

Jazzco commented Aug 5, 2024

wing328 commented Aug 5, 2024

Jazzco commented Aug 5, 2024

Jazzco commented Aug 5, 2024

MartinDelille commented Aug 7, 2024

Jazzco commented Aug 21, 2024

MartinDelille left a comment

Choose a reason for hiding this comment

MartinDelille Sep 3, 2024

Choose a reason for hiding this comment

Jazzco Sep 3, 2024

Choose a reason for hiding this comment

MartinDelille Sep 3, 2024

Choose a reason for hiding this comment

Jazzco commented Jun 10, 2024 •

edited

Loading

Jazzco commented Jun 13, 2024 •

edited

Loading

Jazzco commented Jun 17, 2024 •

edited

Loading