Commit Graph

2296 Commits

Author SHA1 Message Date
evigeant
4335dc5d16 Merge remote-tracking branch 'upstream/master' into fix-cli-options
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
2016-01-28 12:11:14 -05:00
wing328
564fa04f7c Merge pull request #1988 from wing328/maven_build_quiet3
Rebase on latest master for "Using logger instead of System.out #1871"
2016-01-28 11:52:35 +08:00
wing328
f8b82e14fe use logger.info to display command line result 2016-01-28 11:25:11 +08:00
N090536
16f9c8f7dd Changing to INFO level in order for the following switches to work as
expected:
-DdebugModels
-DdebugOperations
-DdebugSupportingFiles
2016-01-28 00:13:00 +08:00
JULIEN MASNADA
8c3bd60a53 Some more... 2016-01-28 00:13:00 +08:00
JULIEN MASNADA
10a9316d75 Fixed some more indentations problems 2016-01-28 00:13:00 +08:00
JULIEN MASNADA
68dc407f1d Fiexd some indentation problem 2016-01-28 00:12:24 +08:00
JULIEN MASNADA
2a9ead870c Use LOGGER instead of LOG
Use spaces instead of tabs
2016-01-28 00:12:24 +08:00
JULIEN MASNADA
2161907a8f Using logger instead of System.out 2016-01-28 00:11:54 +08:00
wing328
bfd17e45fe Merge pull request #1980 from wing328/ruby_add_test
[Ruby] add auto-generated test cases (rspec)
2016-01-27 15:28:56 +08:00
xhh
29885ab2ae Lock version for superagent to 1.7.1
to avoid an unexpected behavior on request.header in 1.7.2:
Node version's request.header uses lower-case keys while browser
version's request.header keeps current case.

See also visionmedia/superagent#873
2016-01-27 12:06:22 +08:00
wing328
72d7acc06f Merge pull request #1979 from wing328/ts_property_double_quote
[TypeScript] double quote model property name
2016-01-27 10:37:20 +08:00
wing328
e4a991da0c add auto-generated test case for ruby 2016-01-26 23:15:02 +08:00
wing328
535cc1dfa7 double quote model property in ts 2016-01-26 18:08:50 +08:00
wing328
f2ab4db419 Merge pull request #1965 from wing328/ts_option_property_naming
[TypeScript] add an option to determine property naming convention
2016-01-26 16:54:20 +08:00
wing328
afd451ec04 Merge pull request #1928 from ergon/feature/retrofit2-rx
Feature/retrofit2 rx
2016-01-26 15:58:08 +08:00
wing328
fc88cb9801 Merge pull request #1967 from wing328/support-jaxrs-cxf-2
[Java][JAX-RS] Support JAX-RS CXF
2016-01-26 15:46:54 +08:00
wing328
2e0047cf86 rename jarxs generator 2016-01-26 15:34:43 +08:00
wing328
2046580d41 update based on discussion on
https://github.com/swagger-api/swagger-codegen/pull/1967/files#r50697083
2016-01-26 15:23:50 +08:00
wing328
17f8931887 add default help text for new ts option 2016-01-26 15:02:26 +08:00
wing328
d5d1c7b98f remove unused default value 2016-01-26 15:00:41 +08:00
wing328
abe039a05f fix test case 2016-01-26 15:00:41 +08:00
wing328
4971461a23 ts add option for model property naming 2016-01-26 15:00:41 +08:00
wing328
6c531142a9 Merge pull request #1969 from jimschubert/csharp_List_to_ICollection_Tests
[csharp] Model tests for List/Collection options
2016-01-26 14:45:47 +08:00
Tony Tam
decedb6c91 Merge pull request #1977 from swagger-api/issue-1976
added args for maven plugin
2016-01-25 22:08:22 -08:00
Tony Tam
3ddccb5e5c fix for #1976, added missing types 2016-01-25 21:34:28 -08:00
Tony Tam
b641d4a17a refactored for access in maven plugin 2016-01-25 21:33:58 -08:00
wing328
ca941b1e3c Merge pull request #1947 from xhh/javascript-default-headers
[JavaScript] Add default headers and some tests
2016-01-26 12:40:29 +08:00
evigeant
b61d76f291 Removed a duplicate cliOptions (it is already added by the base class) 2016-01-25 22:36:24 -05:00
evigeant
d0b99a0f83 Fixed options provider for all classes where cliOptions were added 2016-01-25 22:17:09 -05:00
evigeant
43807adf4f Added missing cliOptions for JaxRSServerCodegen 2016-01-25 21:48:54 -05:00
evigeant
faadccf371 Added missing cliOptions for the StaticHtmlGenerator and
StaticDocGenerator
2016-01-25 21:39:58 -05:00
Jim Schubert
c9a0ff7482 [csharp] Model tests for List/Collection options 2016-01-25 12:45:44 -05:00
Silvio Heuberger
e34706386f Change the artifact identifier for the retrofit2-rx sample 2016-01-25 10:29:13 +01:00
Silvio Heuberger
d60f7d1186 Change templates and test code so that the sample is 1.7 compatible
Alas.
2016-01-25 10:29:13 +01:00
Silvio Heuberger
7dcc1c839e Add script for sample generation and adapt gradle and pom templates 2016-01-25 10:29:13 +01:00
Silvio Heuberger
886abda926 Add 'useRxJava' option to retrofit2 java client generator
This still uses retrofit 2.0.0-beta2 because the api
in beta3 has changed and the package
has been renamed to retrofit2.*

Change retrofit-rx to be a library option
2016-01-25 10:29:13 +01:00
Silvio Heuberger
06827da943 Remove retrofit remnant from javascript client code generator
I highly doubt this code is ever executed.
2016-01-25 10:28:08 +01:00
Jim Schubert
b4eed0d147 Merge branch 'master' into csharp_List_to_ICollection 2016-01-24 23:00:56 -05:00
Jim Schubert
2e958f9223 [csharp] Collections options tests, fix model using directive 2016-01-24 22:55:37 -05:00
wing328
a0b4a07d08 Merge pull request #1960 from dilipkrish/master
Updated the code generation for spring mvc
2016-01-25 10:19:12 +08:00
wing328
fc83139483 resolve minor issue after rebase 2016-01-25 01:11:20 +08:00
Maelig Nantel
491f97f7ef rename codegen names 2016-01-25 00:49:41 +08:00
Maelig Nantel
6d6f366db4 Finish
Tests ok. Some modifications may be done later, maybe...
2016-01-25 00:49:41 +08:00
Maelig Nantel
f3659f88a8 Work almost finish
Aask @wing328 if the modificatgion in the DefaultGenerator class is a
problem. If needed, find a way to do it only for the CXF Codegen.
TODO: Maybe create an abstract JAX-RS Codegen and make Jersey & CXF
extends it ? CXF should not extends Jersey since there at two different
frameworks implementing the JAX-RS specification.
Important: nothing is tested yet, only visual checks during Maven build.
2016-01-25 00:49:07 +08:00
Maelig Nantel
1dbc8a8552 Unit test correction
A unit test was in error due to a duplicate key in a map. Joda library
is now used by default for JAX-RS code generation.
2016-01-25 00:48:30 +08:00
Maelig Nantel
63b7e24c22 merge resolution 2016-01-25 00:48:30 +08:00
Maelig Nantel
3648a79965 Add CXF codegen
Also rename the existing JAX-RS codegen to JAX-RS-Jersey1 codegen, since
JAX-RS is only a specification. Jersey and CXF are both an
implementation of the JAX-RS specification.
2016-01-25 00:47:29 +08:00
Maelig Nantel
44c1e27680 Add mustache template files for Apache CXF support
probably not the final version of the templates
2016-01-25 00:46:02 +08:00
Jim Schubert
0bb30ddccd Merge branch 'master' of github.com:swagger-api/swagger-codegen into csharp_List_to_ICollection 2016-01-24 09:35:46 -05:00