wing328
11d9cbd597
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-07-16 16:10:08 +08:00
wing328
c1825b417c
use html-escaped description for C# (client, server), Java server ( #6061 )
2017-07-14 23:36:24 +08:00
wing328
25a46374c5
Updated Spring, Boot, Fox and Cloud dependencies ( #5969 )
...
* updated Spring, Boot, Fox and Cloud dependencies
* run scripts for java, jaxrs-cxf and spring samples (although changes are not related to my changes)
* update jersey java8 petstore samples
* update java feign samples
* update java petstore samples
* add new files for java petstore clients
* roll back spring cloud dep version
* fix jaxrs-cxf error
2017-07-03 18:44:22 +08:00
Dennis Kieselhorst
407d728908
updated Spring and Spring Boot dependencies ( #5948 )
2017-06-29 22:28:08 +08:00
Dennis Kieselhorst
7a9981b350
updated swagger-ui dependency ( #5945 )
2017-06-29 16:12:33 +08:00
Dennis Kieselhorst
a64c7d7986
updated jackson-version ( #5943 )
2017-06-29 10:56:12 +08:00
Dennis Kieselhorst
e3da4f9fde
updated maven-war-plugin ( #5941 )
2017-06-29 00:14:16 +08:00
Dennis Kieselhorst
4f6e2857cc
removed obsolete jersey2-version ( #5933 )
2017-06-28 16:22:29 +08:00
Tony Tam
73df07d64c
Merge branch 'master' into issue-5753
2017-06-26 13:15:00 -07:00
Dennis Kieselhorst
68d878c244
update to latest CXF release ( #5923 )
2017-06-26 15:55:34 +08:00
Tony Tam
9286e26162
updated versions
2017-06-16 11:49:32 -07:00
Andrea Polci
fd17955685
#5548 Avoid html escaping of pattern in bean validation ( #5549 )
...
* Issue #5548 Avoid html escaping of pattern in bean validation
* Run spring-all-petstore.sh and java-petstore-all.sh scripts
2017-05-04 17:12:13 +08:00
wing328
43812cc002
use origina value of example ( #5540 )
2017-05-03 16:14:20 +08:00
jfiala
ca6b5d09d0
[Jaxrs-cxf] Add check for useGenericResponse for jaxrs-cxf server + client ( #4779 )
...
* add check for useGenericResponse for jaxrs-cxf
* move check for genericresponse to cxf codegen #4713
2017-04-02 16:05:16 +08:00
Matan Rubin
a1dbc53555
[JAXRS-CXF] Respect default values for query parameters ( #4778 )
...
* [JAXRS-CXF][#4776 ] Respect query params default values in generated interfaces
Before this change, the generated interface ignored default values of query
params. Now, it adds the proper @DefaultValue annotation.
See issue #4776 for example.
* [JAXRS-CXF] Update samples
2017-03-26 23:15:34 +08:00
jfiala
43aa4a8569
[Jaxrs-cxf] Add method-level cascaded beanvalidation (@Valid) ( #4921 )
...
* add ApiResponse/s to operation #4718
* add method-level cascaded beanvalidation #4847
2017-03-23 15:56:23 +08:00
wing328
264c9d615f
use unescaped path in server stub templates ( #5157 )
2017-03-23 11:59:04 +08:00
jfiala
2048defe7b
add jackson dependencies to pom for cxf-client #4924 ( #5032 )
2017-03-18 22:13:44 +08:00
jfiala
39eba39625
[Jaxrs-cxf] add ApiResponse/s to operation #4718 ( #4920 )
...
* add ApiResponse/s to operation #4718
* use spaces instead of tabs #4718
* fix alignment issues #4920
* fix alignment issues #4920
* replace tabs with spaces #4920
* updated samples #4920
2017-03-12 16:58:19 +08:00
jfiala
6a7340378a
update beanvalidation templates + samples #4719 ( #4733 )
2017-03-07 23:34:40 +08:00
Paŭlo Ebermann
a710149cdd
Fix #4898 for jaxrs ( #4918 )
...
* fix #4898 for JavaJaxRS (including all libraries).
* Updated samples for jaxrs (after fix for #4898 ).
2017-03-06 20:04:31 +08:00
Johannes Fiala
f72340fb17
change jackson jaxrs version to 2.8.4 #4924
2017-03-05 19:17:27 +01:00
Johannes Fiala
165076a427
add jackson dependencies to pom #4924
2017-03-05 17:30:17 +01:00
Tony Tam
894f272f89
updated core versions
2017-03-01 08:51:18 -05:00
Clem
74da89c6ac
Fix issue when the swagger model contains an 'Object' class ( #4695 )
...
If the swagger model contains a class named 'Object' some mustache templates
will generate non compiling **Java** code.
2017-02-13 18:07:00 +08:00
wing328
c0fc66ebec
Merge branch 'master' of https://github.com/swagger-api/swagger-codegen
2017-02-06 15:33:11 +08:00
wing328
509a156879
Merge branch 'jaxrs_beanval_final_4091' of https://github.com/jfiala/swagger-codegen into jfiala-jaxrs_beanval_final_4091
2017-02-06 15:13:03 +08:00
Markus
4900427bf5
[JAXRS-CXF] Issue 4569 - Re-added usage of contextPath in api.mustache (basePath) ( #4580 )
...
* jaxrs-cxf: Re-added usage of contextPath in api.mustache (basePath)
* jaxrs-cxf: Added useAnnotatedBasePath and generateNonSpringApplication flags
* useAnnotatedBasePath=true uses the @Path annotation in the generated interface to set the basePath, default is false
* generateNonSpringApplication=true generates a web.xml with CXFNonSpringJaxrsServlets. If useAnnotatedBasePath=true only one servlet will be created, otherwise one for each API
* jaxrs-cxf generateNonSpringApplication: removed creation of multiple servlets
Multiple servlets were generated if useAnnotatedBasePath was false.
This is not necessary as there is only ONE basePath per contract
* jaxrs-cxf: added sample generation for useAnnotatedBasePath and generateNonSpringApplication
2017-02-06 14:11:41 +08:00
Markus
a83f8d0449
[JAXRS-Spec|Resteasy|CXF] Issue 4315 - Fixed bug generating arrays of enums ( #4582 )
...
* jaxrs-cxf: Fixed returning of enum arrays generating non-compiling code
* jaxrs-spec/resteasy: Fixed returning of enum arrays generating non-compiling code
* jaxrs-cxf: Switched to petstore-with-fake-endpoints-models-for-testing.yaml contract for sample generation
* Fixed escape char issue in ApiOperation summary
* Fixed code generation for non String-type enums
* Fixed @PATCH annotation import
* jaxrs-spec: Switched to petstore-with-fake-endpoints-models-for-testing.yaml contract for sample generation
2017-02-05 23:01:18 +08:00
Matan Rubin
8042f5ca3e
[JAXRS-CXF] [issue #4386 ] add builder-style methods to model classes ( #4468 )
...
* [JAXRS-CXF] [issue #4386 ] add builder-style methods to model classes
before this change, model classes had only a default constructor and
setter methods, resulting in code like this:
myModel = MyModel();
myModel.setFirstField(firstField);
myModel.setSecondField(secondField);
return myModel;
this change adds builder style methods, such that the above code can be
written more compactly:
return MyModel().firstField(firstField).secondField(secondField);
this is consistent with other JAVA generators in swagger-codegen.
* update jaxrs-cxf sample code
2017-01-31 23:07:12 +08:00
Johannes Fiala
3ffc4bfa9d
backport support DecimalMin/DecimalMax #4091
2017-01-23 21:26:42 +01:00
Dan Mikita
0a559f0dd2
Add support for modifier within the Jaxb XMLElement annotation ( #4433 )
...
* fixes #4432 Adding support for the modifier within the Jaxb XMLElement annotation. Updated README with JaxbAnnotations configuration option.
* #4432 Running the Petstore files
2017-01-17 15:26:30 +08:00
Joseph Moore
d40f7a41b6
Add triple-mustache to all instances of vendorExtensions.extraAnnotation. ( #4553 )
...
This covers the usages that weren't fixed in #3825
Triple mustache is required because annotations may contain chars like
"=" that would be mistakenly encoded.
2017-01-13 23:01:15 +08:00
wing328
4d4af71446
[CI] Add scripts to detect carriage return and tab ( #4526 )
...
* add script to detect carriage return
* add check for generator as well
* add fail fast to travis config
* remove tab
* move scripts under bin/utils
* remove carriage return
* move scripts to bin/utils
2017-01-09 18:29:41 +08:00
Matan Rubin
5867728724
[JaxRS-CXF][bug #4330 ] support containers in return types ( #4339 )
...
* [JaxRS-CXF][bug #4330 ] support containers in return types
before this commit if a method returned a container (List or Map) of
THING (i.e. List<THING> or Map<String, THING>) the generated return type would
drop the container and only leave THING.
this commit fixes this issue such that the container type is properly
generated.
* regenerate jaxrs-cxf petstore sample
2016-12-14 13:58:56 +08:00
wing328
939a8052f3
[Java] Uncomment @Max @Min syntax in bean validation files ( #4340 )
...
* uncomment max min syntax in bean validation files (java)
* remove eol at the end of the file
2016-12-08 15:22:55 +08:00
jfiala
b02d505ad9
Refine CXF Add Spring Annotation-Config + Jboss flag for CXF/Resteasy + fix OuterEnum ( #4164 )
...
* add json annotations
* add cli flag to check for jaxb annotations
* add CLI-flag for switching Spring-XML or annotation config #4088
* add cli flag for generating jboss depl. descriptor #4088
* add JbossFeature CLI flag to Resteasy #4088
* update/add tests #4088
* cleanup tabs #4088
* improve api formatting #4088
* refine formatting #4088
* refine formatting again #4088
* add separate CLI-flags for controlling junit test features #4088
* add json annotations
* add cli flag to check for jaxb annotations
* add CLI-flag for switching Spring-XML or annotation config #4088
* add cli flag for generating jboss depl. descriptor #4088
* add JbossFeature CLI flag to Resteasy #4088
* update/add tests #4088
* cleanup tabs #4088
* improve api formatting #4088
* refine formatting #4088
* refine formatting again #4088
* add separate CLI-flags for controlling junit test features #4088
* add check for void methods + assertNotNull(response) #4088
* add spaces for @Produces #4088
* allow build with no web.xml config #4088
* comment invocations of tests #4088
* update petstore sample jaxrs-cxf server with gen/java first #4088
* re-generate jaxrs-cxf with src/gen/java #4088
* add client jaxrs-cxf #4088
* add switch to load SwaggerUI automatically #4088
* update to CXF 3.1.8 including supportSwaggerUi flag #4088
* update to cxf 3.1.8 and swagger-core 1.5.10 #4088
* update generated petstore for jaxrs-cxf #4088
* change Spring Boot urls to root #4088
* fix spring xml config #4088
* fix external enum usage for jaxrs-cxf #4160
* cleanup jaxrs-annotations in impl class
* fix handling of multiparts #4088
* fix @Min/@Max comments in beanValidationQueryParams #4088
* add swagger-codegen-ignore file+add src/test/resources #4088
* add cli-flag for produces/consumes json in api #4088
* add test case for outerEnum #4160
2016-11-19 16:09:13 +08:00
wing328
cce410c463
add vendor extension to handle void response in jaxrs-cxf
2016-11-08 21:06:38 +08:00
wing328
e78ce6fb1e
Merge pull request #4059 from markus-wa/issue-4045
...
[JAXRS-CXF] Issue 4045 - Fixed enum marshalling & fromValue()
2016-11-07 23:42:29 +08:00
wing328
14bca6cd89
[Java] BeanValidation + JAXRS CXF server generator ( #4068 )
...
* add pom-file to cxf including cxf-client #2017
* adapt pom sourceFolder in pom.mustache to gen/java #2017
* add test templates for CXF #2017
* optimize mustache template structure, remove tabs #3280 #2549
* refined dependency to swagger-jaxrs #2017
* refined annotations and line breaks #2549
* fix tabs instead of spaces...
* move annotations from getter to field for server model
* cleanup tabs
* add example for gzipping #2017
* add complete WAR to cxf-server #2017
* add readme + rework pom #2017
* add cli switch for beanvalidation #2549
* move beanvalidation into separate subtemplate and reuse for cxf
* add beanValidation java template
* corrected path to mustache file
* fix AbstractOptionsTest, add default false for USE_BEANVALIDATION
* add pom-file to cxf including cxf-client #2017
* adapt pom sourceFolder in pom.mustache to gen/java #2017
* add test templates for CXF #2017
* optimize mustache template structure, remove tabs #3280 #2549
* refined dependency to swagger-jaxrs #2017
* refined annotations and line breaks #2549
* fix tabs instead of spaces...
* move annotations from getter to field for server model
* cleanup tabs
* add example for gzipping #2017
* add complete WAR to cxf-server #2017
* add readme + rework pom #2017
* add cli switch for beanvalidation #2549
* move beanvalidation into separate subtemplate and reuse for cxf
* add beanValidation java template
* corrected path to mustache file
* fix AbstractOptionsTest, add default false for USE_BEANVALIDATION
* add beanvalidation to okhttp-gson library #2549
* cleanup api.mustache for cxf #3281
* temporary fix for invalid BeanValidation-pattern with / #2549
* temporary fix for invalid BeanValidation-pattern with / #2549
* remove jaxrs-annotations from implementation classes #3281
* add configuration to generate spring web application #4003
* clean up unnecessary @Path annotation (part of method level!)
* add support for minItems/maxItems #2549
* add support for BeanValidation for query params #2549
* add imports for bean validation #2549
* add switches for various cxf server features #2017
* fix tests #2549 #2017
* re-create bin folder
* cleanup
* cleanup
* Revert "temporary solution for pattern - move to AbstractJavaCodegen #2549 "
This reverts commit 82df5e657f31303bcb7d38f1dc013183d3509da2, reversing
changes made to 65e87f23a6804a0d5c0926c916a9cd6866e7fee0.
Conflicts:
bin/akka-scala-petstore.sh
bin/android-petstore-all.sh
bin/android-petstore-httpclient.sh
bin/android-petstore-volley.sh
bin/android-petstore.sh
bin/aspnet5-petstore-server.sh
bin/clojure-petstore.sh
bin/cpprest-petstore.sh
bin/csharp-dotnet2-petstore.sh
bin/csharp-petstore-all.sh
bin/csharp-petstore.sh
bin/csharp-property-changed-petstore.sh
bin/cwiki-petstore.sh
bin/dart-petstore.sh
bin/dynamic-html.sh
bin/erlang-petstore-server.sh
bin/flash-petstore.sh
bin/flaskConnexion-python2.sh
bin/flaskConnexion.sh
bin/go-petstore-server.sh
bin/go-petstore.sh
bin/groovy-petstore.sh
bin/haskell-servant-petstore.sh
bin/html-petstore.sh
bin/html2-petstore.sh
bin/java-inflector-petstore-server.sh
bin/java-petstore-all.sh
bin/java-petstore-feign.sh
bin/java-petstore-jersey1.sh
bin/java-petstore-jersey2.sh
bin/java-petstore-okhttp-gson-parcelable.sh
bin/java-petstore-okhttp-gson.sh
bin/java-petstore-retrofit.sh
bin/java-petstore-retrofit2.sh
bin/java-petstore-retrofit2rx.sh
bin/java-undertow-petstore-server.sh
bin/java8-petstore-jersey2.sh
bin/javascript-closure-angular.sh
bin/javascript-petstore-all.sh
bin/javascript-petstore.sh
bin/javascript-promise-petstore.sh
bin/jaxrs-cxf-cdi-petstore-server.sh
bin/jaxrs-cxf-petstore-server.sh
bin/jaxrs-jersey1-petstore-server.sh
bin/jaxrs-petstore-server.sh
bin/jaxrs-resteasy-joda-petstore-server.json
bin/jaxrs-resteasy-joda-petstore-server.sh
bin/jaxrs-resteasy-petstore-server.sh
bin/jaxrs-spec-petstore-server.sh
bin/jmeter-petstore.sh
bin/lumen-petstore-server.sh
bin/nancyfx-petstore-server.sh
bin/nodejs-petstore-server.sh
bin/objc-petstore-all.sh
bin/objc-petstore-coredata.sh
bin/objc-petstore.sh
bin/perl-petstore.sh
bin/php-petstore.sh
bin/python-petstore.sh
bin/qt5-petstore.sh
bin/rails5-petstore-server.sh
bin/ruby-petstore.sh
bin/run-all-petstore
bin/scala-async-petstore.sh
bin/scala-petstore.sh
bin/scalatra-petstore-server.sh
bin/security/csharp-petstore.sh
bin/security/go-petstore.sh
bin/security/java-petstore-okhttp-gson.sh
bin/security/javascript-closure-angular.sh
bin/security/javascript-petstore.sh
bin/security/lumen-petstore-server.sh
bin/security/objc-petstore.sh
bin/security/perl-petstore.sh
bin/security/php-petstore.sh
bin/security/python-petstore.sh
bin/security/qt5cpp-petstore.sh
bin/security/ruby-petstore.sh
bin/security/run-all-petstore-security-test
bin/security/scala-petstore.sh
bin/security/silex-petstore-server.sh
bin/security/slim-petstore-server.sh
bin/security/swift-petstore.sh
bin/security/typescript-angular.sh
bin/security/typescript-angular2.sh
bin/security/typescript-fetch.sh
bin/security/typescript-node.sh
bin/silex-petstore-server.sh
bin/sinatra-petstore-server.sh
bin/slim-petstore-server.sh
bin/spring-all-pestore.sh
bin/spring-cloud-feign-petstore.sh
bin/spring-mvc-petstore-j8-async-server.sh
bin/spring-mvc-petstore-server.sh
bin/spring-stubs.sh
bin/springboot-petstore-server.sh
bin/swift-petstore-all.sh
bin/swift-petstore-promisekit.sh
bin/swift-petstore-rxswift.sh
bin/swift-petstore.sh
bin/tizen-petstore.sh
bin/typescript-angular-petstore.sh
bin/typescript-angular2-petstore-all.sh
bin/typescript-angular2-petstore-with-npm.sh
bin/typescript-angular2-petstore.sh
bin/typescript-fetch-petstore-all.sh
bin/typescript-fetch-petstore-target-es6.sh
bin/typescript-fetch-petstore-with-npm-version.sh
bin/typescript-fetch-petstore.sh
bin/typescript-node-petstore-all.sh
bin/typescript-node-petstore-with-npm.sh
bin/typescript-node-petstore.sh
bin/typescript-petstore-npm.json
bin/windows/akka-scala-petstore.bat
bin/windows/android-petstore.bat
bin/windows/aspnet5-petstore-server.bat
bin/windows/async-scala-petstore.bat
bin/windows/clojure-petstore.bat
bin/windows/cpprest-petstore.bat
bin/windows/csharp-petstore.bat
bin/windows/dart-petstore.bat
bin/windows/dynamic-html-petstore.bat
bin/windows/flash-petstore.bat
bin/windows/go-petstore.bat
bin/windows/html-petstore.bat
bin/windows/java-petstore-okhttp-gson.bat
bin/windows/java-petstore.bat
bin/windows/javascript-petstore.bat
bin/windows/objc-petstore.bat
bin/windows/perl-petstore.bat
bin/windows/php-petstore.bat
bin/windows/python-petstore.bat
bin/windows/qt5cpp-petstore.bat
bin/windows/rails5-petstore-server.bat
bin/windows/ruby-petstore.bat
bin/windows/scala-petstore.bat
bin/windows/spring-mvc-petstore-j8-async-server.bat
bin/windows/spring-mvc-petstore-server.bat
bin/windows/springboot-petstore-server.bat
bin/windows/swift-petstore.bat
bin/windows/tizen-petstore.bat
bin/windows/typescript-angular.bat
bin/windows/typescript-angular2.bat
bin/windows/typescript-fetch.bat
bin/windows/typescript-node-with-npm.bat
bin/windows/typescript-node.bat
* Revert "cleanup"
This reverts commit c752ba85d8a795ebcaf902a0eb06ab0c5755d128.
* Revert "re-create bin folder"
This reverts commit 8a6d41314784a2ae5ce29ae54d7db1ebec418751.
Conflicts:
bin/windows/spring-mvc-petstore-j8-async-server.bat
bin/windows/spring-mvc-petstore-server.bat
bin/windows/springboot-petstore-server.bat
* Revert "re-create bin folder"
This reverts commit 8a6d41314784a2ae5ce29ae54d7db1ebec418751.
Conflicts:
bin/windows/spring-mvc-petstore-j8-async-server.bat
bin/windows/spring-mvc-petstore-server.bat
bin/windows/springboot-petstore-server.bat
* re-create bin from master
* Revert "re-create bin from master"
This reverts commit d4b5c9aac54d62dfb3790c1bf2829472be2ec8fd.
* Revert "Revert "re-create bin folder""
This reverts commit 4369b35dbe9d21f8a93e7632fd92a9a760256db5.
* Revert "re-create bin folder"
This reverts commit 8a6d41314784a2ae5ce29ae54d7db1ebec418751.
* Revert "temporary solution for pattern - move to AbstractJavaCodegen #2549 "
This reverts commit 82df5e657f31303bcb7d38f1dc013183d3509da2, reversing
changes made to 65e87f23a6804a0d5c0926c916a9cd6866e7fee0.
* correct @Path to re-activate Swagger support #
* change sourceFolder to default
* re-activate unittest generator + support gzip switch #2017
* add switch to support Spring Boot + integration tests
* add cxf client generator, rename cxf server generator #2017
* add interfaces for language feature support #4003
* add comments #2017
* correct reference to context.xml.mustache #4003
* use dynamic sourceFolder path #2017
* replace tabs with spaces #4003
* use hard-coded sourceFolder #4003
* rename language for backwards compatibility
* cleanup todo comment #4003
* move convertPropertyToBooleanAndWriteBack to DefaultCodegen #4003
* change reference to beanValidation.mustache to local copy for cxf
* cleanup client-side beanvalidation (currently not working in CXF)
* add support for tags #4003
* fix instantiiation of method parameters
* move commonValidationFeature from bus to endpoint #4003
2016-10-25 18:15:15 +08:00
walthema
1e975637c9
Fixed enum marshalling & fromValue()
...
Added toString() to enums
2016-10-24 15:07:46 +02:00
wing328
ec25bd793f
[Java] Remove duplicated model description in Spring, JAX-RS models ( #3887 )
...
* fix duplicated description in spring model
* fix duplicated description in jaxrs models
* fix resteasy dependency
2016-09-28 19:34:38 +08:00
wing328
4f0f128ddb
fix enum value issue for jaxrs cxf
2016-09-08 17:30:20 +08:00
rynger
3faee1f6ce
Amending Path annotation ( #3553 )
...
* Amending Path annotation
Changed the Path annotation value from "/" to "/{{baseName}}"
* jaxrs-cxf-petstore-server.sh script was not referencing cxf module directory. Included generated files following script run. Have amended Path annotation value to {{contextPath}} and removed public access modifier from template as this is redundant for Java interface definition.
2016-08-09 12:09:07 +08:00
Remi Salembier
799b27b249
Fix Java CXF on parameter names containing '_' or '-'
2016-06-16 16:18:01 +02:00
wing328
c6f03806df
Replaced {{mediaType}} with {{{mediaType}} to keep the original media
2016-05-20 17:48:47 +08:00
oskar
d45d36d8a2
Fixing broken enumeration swagger/json types for JaxRS-CXF templates.
2016-04-06 21:51:17 +02:00
Kosta Krauth
a07eb3bb14
Missing multipart (form data) imports.
...
Swagger files that declare "in: formData" parameters will result in API class that cannot be compiled due to the usage of "@Multipart" annotations in method signatures.
2016-03-19 14:12:24 -04:00
Maelig Nantel
081c29c984
fix sample generation
2016-03-01 11:25:29 +01:00
Maelig Nantel
37e62b89bc
Fixes for JAXRS-CXF Codegen
2016-02-26 10:56:26 +01:00
