Commit Graph

91 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
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
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
4971461a23 ts add option for model property naming 2016-01-26 15:00:41 +08:00
evigeant
d0b99a0f83 Fixed options provider for all classes where cliOptions were added 2016-01-25 22:17:09 -05:00
Jim Schubert
c9a0ff7482 [csharp] Model tests for List/Collection options 2016-01-25 12:45:44 -05: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
Jim Schubert
2e958f9223 [csharp] Collections options tests, fix model using directive 2016-01-24 22:55:37 -05:00
wing328
fc83139483 resolve minor issue after rebase 2016-01-25 01:11:20 +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
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
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
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
Jim Schubert
9dc40128ac [csharp] Options: useCollection, returnICollection
This change is inline with Microsoft's recommended guidelines for
collects
(https://msdn.microsoft.com/en-us/library/dn169389(v=vs.110).aspx).

Added generator options for csharp to:

* useCollection: Deserialize responses into and return Collection<T>
* returnICollection: For List<T> or Collection<T>, return ICollection<T>
  instead of the concrete type

As a consequence of useCollection, method imputs will also change to
Collection<T>.
2016-01-24 09:13:39 -05:00
wing328
3086bb624f Merge pull request #1941 from jhancock93/projectfile2
CSharp client: optionally build .csproj file
2016-01-24 12:50:40 +08:00
John Hancock
b4bce238c2 CSharp: Optionally build csproj file 2016-01-19 21:00:54 -05:00
Maelig Nantel
370a8d136f fixes 2016-01-18 11:35:57 +01:00
Maelig Nantel
a39942f43f Merge remote-tracking branch 'refs/remotes/swagger-api/master' into fix-java-warnings
# Conflicts:

#	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java
2016-01-18 10:10:27 +01:00
Tony Tam
bde2bbab56 Merge pull request #1906 from swagger-api/issue-1905
added date library option
2016-01-15 16:15:41 -08:00
Tony Tam
04e0df3b4a added date library option 2016-01-15 14:20:20 -08:00
Maelig Nantel
467939216c fix java warnings
Do not impact any feature. Juste correct some Java warnings (static
methods, unused imports or parameters...).
2016-01-15 14:02:55 +01:00
John Hancock
ebe090572f CSharp: add support for DateTimeOffset and sourceFolder configuration options
Adds option to use DateTimeOffset to model datetime fields instead of
DateTime to allow preservation of timezone information. Modifies
ApiClient.ParameterToString to support DateTimeOffset. Also adds
sourceFolder option.
2016-01-08 13:03:33 -05:00
John Hancock
5f9164049c CSharp: add support for DateTimeOffset and sourceFolder configuration 2016-01-08 13:03:24 -05:00
wing328
468a13dc96 add cli option to optionally generate assemblyinfo.cs (default: true) 2016-01-08 17:03:57 +08:00
Kevin Glinski
3465a746d3 adding configurable options to the gemspec file 2016-01-06 21:02:29 -05:00
Tony Tam
19c81bf7bd fix, tests for #1822 2016-01-06 05:29:44 -08:00
Tony Tam
e82c12ccf8 updated tests, added parentSchema 2016-01-05 16:12:03 -08:00
Tony Tam
ba9bd11a8d updated parentModel names in inheritence situations 2016-01-05 14:58:36 -08:00
xhh
beabe8cda2 Merge branch 'master' into android-volley-library
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
2016-01-05 16:39:15 +08:00
lugaru1234
b88e96ae10 Default values have been added to the boolean options 2016-01-04 16:33:34 +03:00
xhh
0103c2f906 Change the android-volley client codegen to an Android library 2016-01-04 19:09:07 +08:00
wing328
c315d7f3df Merge pull request #1775 from Shyri/android-volley
Android volley client generator
2016-01-04 14:30:55 +08:00
evigeant
ca67e3506b Fixed idententation to use spaces instead of tab 2016-01-03 15:07:27 -05:00
evigeant
5867608ee1 Merge branch 'master' into feature/jaxrs-no-sys-property
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-03 08:18:31 -05:00
Tony Tam
d75e602168 made imports more intelligent 2015-12-30 13:16:08 -08:00
Tony Tam
1cd54ee685 added bigDecimalAsString option to allow serializing with strings 2015-12-30 12:32:37 -08:00
wing328
96889d47ba Merge pull request #1742 from icha024/master6
Spring-MVC config "j8-async": Uses async servlet & Java 8 interface
2015-12-30 17:00:35 +08:00
Tony Tam
405e09a057 added tests 2015-12-29 23:44:15 -08:00
Tony Tam
29f928d644 prepare for multiple jaxrs libraries 2015-12-29 23:28:31 -08:00
Tony Tam
ffe12b0620 added library, date library 2015-12-29 23:28:09 -08:00
Shyri Villar
b41efdab5f updated android-volley build.gradle 2015-12-29 18:12:11 +01:00
Shyri Villar
a2aeb5a129 Added ClientOptions android-volley 2015-12-29 15:44:37 +01:00
Tony Tam
cbfdffb09a Merge pull request #1734 from wing328/fix_array_inline_response
Fix array/map inline response/model
2015-12-27 06:18:01 -08:00
Ian Chan
638ee88830 Removed Jersey2 test from spring-mvc codegen
The previous patch to allow sub options to spring-mvc had removed the
invalid Jersey2 option from spring-mvc codegen, this patch also fixes
the associated test.
2015-12-23 10:29:47 +13:00
wing328
c1dda0ca17 update test case for inline model 2015-12-18 16:50:55 +08:00
evigeant
e19d4228e9 Fixed CodeGen tests following addition of implFolder additional property
in jaxrs
2015-12-16 22:22:01 -05:00
Kirill Vlasov
49a6d0e6c1 Fixing squid:S1161 - @Override annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one 2015-12-15 14:09:31 +05:00
wing328
4b656c516f add default value to php model 2015-12-08 15:59:46 +08:00