Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Support for KumuluzEE microprofile runtime #5944

Merged
merged 20 commits into from
Aug 20, 2020
Merged

Support for KumuluzEE microprofile runtime #5944

merged 20 commits into from
Aug 20, 2020

Conversation

chuckle-dog
Copy link
Contributor

Implemented support for KumuluzEE, #5939

Changes are limited to the addition of KumuluzEE templates and a new library option for the java and jaxrs-spec generators, as well as a single edit in the DefaultGenerator to add some required information regarding API class file names to the mustache bundle. These additions should not interfere with existing generator features.

  • 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.

@bbdouglas (2017/07) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01) @karismann (2019/03) @Zomzog (2019/04) @lwlee2608 (2019/10) @bkabrda (2020/01)

@wing328
Copy link
Member

wing328 commented Apr 21, 2020

Looks like you failed to do a rebase properly resulting in some commits not authored by you in the PR

I would suggest you file a new PR by cherry-picking the commits and then resolve the merge conflicts if any.

@jmezna
Copy link
Contributor

jmezna commented Apr 21, 2020

There are some commits authored by me, I also helped with the development. Is this a problem?

@wing328
Copy link
Member

wing328 commented Apr 21, 2020

@jmezna ah sorry I misread. Please resolve the merge conflicts and I'll merge (if local test results are good)

* {{{description}}}
**/
{{/description}}
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} {
Copy link
Contributor

@Ravisankar-Challa Ravisankar-Challa Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add the option {{>additionalModelTypeAnnotations}} on the top of the public class {{ classname }} for users/developers to add custom annotations
image

@Ravisankar-Challa
Copy link
Contributor

@chuckle-dog There are some bugs in Microprofile rest client reported here #6028 which are being fixed now. I can see KumuluzEE microprofile rest client is reusing the code form Microprofile rest client which will have the same issues reported in #6028

@chuckle-dog
Copy link
Contributor Author

@Ravisankar-Challa Is that going to be an issue? The additional property I added for framework selection only replaces the pom and adds two minor files in the case of KumuluzEE and does not affect the actual code that is generated. I also assumed the rest was functioning as specified, so any fixes to the generator to make it so should not affect the kumuluz framework option.

@Ravisankar-Challa
Copy link
Contributor

@chuckle-dog Sorry you are right. I was looking a previous commit message. I don't see any issues in the latest commit.

@wing328
Copy link
Member

wing328 commented May 1, 2020

@chuckle-dog Please resolve the merge conflicts when you've time.

this.setMicroprofileFramework(additionalProperties.get(MICROPROFILE_FRAMEWORK).toString());

if (!MICROPROFILE_KUMULUZEE.equals(microprofileFramework)) {
throw new RuntimeException("Ivalid microprofileFramework '{}'. Must be 'kumuluzee' or none.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix the typo (Ivalid => Invalid) and string interpolation '{}' in another PR.

@@ -91,7 +96,9 @@
// (mustache does not allow for boolean operators so we need this extra field)
protected boolean doNotUseRx = true;
protected boolean usePlayWS = false;
protected String playVersion = PLAY_26;
protected String playVersion = PLAY_25;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll change it back to PLAY_26 as the default play version in another PR.

@wing328 wing328 added this to the 5.0.0 milestone Aug 20, 2020
Copy link
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested all 3 generators and the result is good.

@wing328 wing328 merged commit c19350b into OpenAPITools:master Aug 20, 2020
@wing328
Copy link
Member

wing328 commented Aug 20, 2020

Filed a follow-up PR: #7253

jimschubert added a commit that referenced this pull request Aug 23, 2020
* master: (720 commits)
  [docs] Update README badges (#7276)
  Update apiInvoker.mustache and sample file for akka-scala client for issue #7258 fix (#7259)
  [Dart] Get all enum values in a list (#7166)
  Update .gitattributes
  [ci] Set ubuntu workflow verification to autoclrf=true, safeclrf=false
  Update check-supported-versions.yaml
  [ci] Update gitattributes and allow skipping docs generation for Windows CI workflows (#7273)
  [core][bug] FILES is now path relative with no prefixes (#7271)
  Update check-supported-versions.yaml
  Update check-supported-versions.yaml (#7268)
  [Java][jersey2] Add jersey injection dependencies (#7240)
  [C][Clang Static Analyzer] Remove the useless variable when assembling URL (#7255)
  Date format dart (#6389)
  minor enhancement to java client generator (#7253)
  typescript: Fix Union Types Import Issue (#6789)
  Modifying the es5 and es6 templates for javascript to handle default values (#6649)
  [python-exp] simplify examples (#7157)
  Support for KumuluzEE microprofile runtime (#5944)
  [C#][netcore] minor improvements and bug fixes (#7244)
  Deprecate Flash (ActionScript) client generator (#7231)
  ...
jimschubert added a commit to mohamedelhabib/openapi-generator that referenced this pull request Aug 24, 2020
* master: (219 commits)
  [java] Appropriate instantiation of model with dynamic properties (OpenAPITools#6052)
  [docs] Update README badges (OpenAPITools#7276)
  Update apiInvoker.mustache and sample file for akka-scala client for issue OpenAPITools#7258 fix (OpenAPITools#7259)
  [Dart] Get all enum values in a list (OpenAPITools#7166)
  Update .gitattributes
  [ci] Set ubuntu workflow verification to autoclrf=true, safeclrf=false
  Update check-supported-versions.yaml
  [ci] Update gitattributes and allow skipping docs generation for Windows CI workflows (OpenAPITools#7273)
  [core][bug] FILES is now path relative with no prefixes (OpenAPITools#7271)
  Update check-supported-versions.yaml
  Update check-supported-versions.yaml (OpenAPITools#7268)
  [Java][jersey2] Add jersey injection dependencies (OpenAPITools#7240)
  [C][Clang Static Analyzer] Remove the useless variable when assembling URL (OpenAPITools#7255)
  Date format dart (OpenAPITools#6389)
  minor enhancement to java client generator (OpenAPITools#7253)
  typescript: Fix Union Types Import Issue (OpenAPITools#6789)
  Modifying the es5 and es6 templates for javascript to handle default values (OpenAPITools#6649)
  [python-exp] simplify examples (OpenAPITools#7157)
  Support for KumuluzEE microprofile runtime (OpenAPITools#5944)
  [C#][netcore] minor improvements and bug fixes (OpenAPITools#7244)
  ...
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants