Skip to content

Conversation

@jfiala
Copy link
Contributor

@jfiala jfiala commented Nov 9, 2016

PR checklist

  • Read the contribution guildelines.
  • Ran the shell/batch script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates)

updated server/petstore/jaxrs-cxf and created client/petstore/jaxrs-cxf

  • Filed the PR against the correct branch: master for non-breaking changes and 2.3.0 branch for breaking (non-backward compatible) changes.

Description of the PR

see #4088 for cxf improvements
see #4160 + #3859 for cxf enumOuterClass.mustache fix

former PR see #4147 (closed as showed all changes from master)

jfiala added 24 commits November 3, 2016 19:24
@jfiala
Copy link
Contributor Author

jfiala commented Nov 9, 2016

@wing328 pls check (details are in the issue #4088), you can merge if everything is alright.
Sorry for the second PR, but it always after I do a rebase on my branch the PR shows all my changes + all changes to the origin/master, if I create a new PR everything is clean again.

@jfiala
Copy link
Contributor Author

jfiala commented Nov 9, 2016

@wing328 the samples for server/petstore/jaxrs-cxf in the master are outdated (and source folder is gen/java instead of new src/gen/java) and client/jaxrs-cxf is missing.
Shall I re-generate both languages and commit?

I assume you want to have the files generated with default-options.
Should I also create an additional folder with all flags active to have a showcase for this as well?

@jfiala
Copy link
Contributor Author

jfiala commented Nov 9, 2016

@wing328 updated samples/petstore for jaxrs-cxf and added the new client/petstore/jars-cxf + verified both compile.

For the API-tests I had to comment the invocation and assertion as there is a problem with the uploadFile-test of PetApiTest.java because java.io.File is used instead of org.apache.cxf.jaxrs.ext.multipart.Attachment. But I think this should be better solved in a separate issue, then we can also invoke the tests of the generated methods and thus ensure the generated tests are actually running.

@wing328
Copy link
Contributor

wing328 commented Nov 11, 2016

I'll review this weekend and let you know if I've any question.

@wing328 wing328 added this to the v2.2.2 milestone Nov 11, 2016
@jfiala
Copy link
Contributor Author

jfiala commented Nov 11, 2016

@wing328 also added CLI-flag useSwaggerUI to allow SwaggerUI to be used immediately.

@jfiala jfiala changed the title Refine CXF Add Spring Annotation-Config + Jboss flag for CXF/Resteasy Refine CXF Add Spring Annotation-Config + Jboss flag for CXF/Resteasy + fix OuterEnum Nov 11, 2016
@wing328
Copy link
Contributor

wing328 commented Nov 19, 2016

@jfiala I went through all the changes, which look good to me. Thanks for the contribution.

@wing328 wing328 merged commit b02d505 into swagger-api:master Nov 19, 2016
@wing328 wing328 changed the title Refine CXF Add Spring Annotation-Config + Jboss flag for CXF/Resteasy + fix OuterEnum [Java] Refine CXF Add Spring Annotation-Config, Jboss flag for CXF/Resteasy, fix OuterEnum Feb 21, 2017
davidgri pushed a commit to davidgri/swagger-codegen that referenced this pull request May 11, 2017
… + fix OuterEnum (swagger-api#4164)

* add json annotations

* add cli flag to check for jaxb annotations

* add CLI-flag for switching Spring-XML or annotation config swagger-api#4088

* add cli flag for generating jboss depl. descriptor swagger-api#4088

* add JbossFeature CLI flag to Resteasy swagger-api#4088

* update/add tests swagger-api#4088

* cleanup tabs swagger-api#4088

* improve api formatting swagger-api#4088

* refine formatting swagger-api#4088

* refine formatting again swagger-api#4088

* add separate CLI-flags for controlling junit test features swagger-api#4088

* add json annotations

* add cli flag to check for jaxb annotations

* add CLI-flag for switching Spring-XML or annotation config swagger-api#4088

* add cli flag for generating jboss depl. descriptor swagger-api#4088

* add JbossFeature CLI flag to Resteasy swagger-api#4088

* update/add tests swagger-api#4088

* cleanup tabs swagger-api#4088

* improve api formatting swagger-api#4088

* refine formatting swagger-api#4088

* refine formatting again swagger-api#4088

* add separate CLI-flags for controlling junit test features swagger-api#4088

* add check for void methods + assertNotNull(response) swagger-api#4088

* add spaces for @produces swagger-api#4088

* allow build with no web.xml config swagger-api#4088

* comment invocations of tests swagger-api#4088

* update petstore sample jaxrs-cxf server with gen/java first swagger-api#4088

* re-generate jaxrs-cxf with src/gen/java swagger-api#4088

* add client jaxrs-cxf swagger-api#4088

* add switch to load SwaggerUI automatically swagger-api#4088

* update to CXF 3.1.8 including supportSwaggerUi flag swagger-api#4088

* update to cxf 3.1.8 and swagger-core 1.5.10 swagger-api#4088

* update generated petstore for jaxrs-cxf swagger-api#4088

* change Spring Boot urls to root swagger-api#4088

* fix spring xml config swagger-api#4088

* fix external enum usage for jaxrs-cxf swagger-api#4160

* cleanup jaxrs-annotations in impl class

* fix handling of multiparts swagger-api#4088

* fix @Min/@max comments in beanValidationQueryParams swagger-api#4088

* add swagger-codegen-ignore file+add src/test/resources swagger-api#4088

* add cli-flag for produces/consumes json in api swagger-api#4088

* add test case for outerEnum swagger-api#4160
Sign up for free to 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.

2 participants