Commit Graph

5251 Commits

Author SHA1 Message Date
wing328
5c4a05e212 Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2017-04-25 21:40:19 +08:00
wing328
3ef7694b9f Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-25 21:39:17 +08:00
wing328
745951c1ce Add missing UUID mapping for some generators (#5474)
* remove trailing space in cpprest, update samples

* add missing uuid mapping for generators
2017-04-25 21:16:17 +08:00
erdarun
fa09d75180 Fix NullPointerException for info.version on Javascript client codegen (#5471)
* Fix NullPointerException for info.version on Javascript client codegen

* Set/Return project default version to 1.0.0 if info.version not found

* info version null check handled and default version/appVersion value set to 1.0.0

* Removed null check for info version. Fixed DefaultGenerator code to handle null check.

* Semicolon added missing
2017-04-25 21:15:39 +08:00
sabras75
00651dd340 Fix#5463 - [QT5CPP] missing SWGUUID when generating client based on swager.yaml containing a string with format 'uuid' (#5472)
* Add support to UUID type

* Simplify and use a simple QString instead of a QUuid.
Work for using a QUuid is way larger than supporting QString (imply modifying multiple c++ templates).
Current needs are fullfill with the use of a simple QString, so I let the use of QUuid for future enhancement.

* - add windows executable for generating qt5 security samples
- update sample clients
PS : some modifications on the samples are not related to the patch I applied. Were the samples up-to-date ?
2017-04-25 20:54:05 +08:00
erdarun
d392f0b12e Fix NullPointerException for info.version on Javascript client codegen (#5475)
* Fix NullPointerException for info.version on Javascript client codegen

* info version null check handled and default version/appVersion value set to 1.0.0

* Removed null check for info version. Fixed DefaultGenerator code to handle null check.

* semicolon added missing
2017-04-25 20:11:04 +08:00
nikitozz
80dccfe395 The new .NET project file format support (#5439) 2017-04-25 10:22:59 +08:00
Jani Väinölä
9055dfc42e Jaxrs jersey2 support (#5058)
* [JAVA/] jaxrs/jersey2 (Issue: 4662) Made java8-date codegeneration to work with jersey2

* Ran shellscripts for  jaxrs-jersey-petstore-server and java8-petstore-jersey2  to update petstore samples
2017-04-25 00:53:34 +08:00
Kenny Jones
c14da15b3e Feature: Enable validation (#5391)
When useBeanValidation is enabled make sure the annotation @Valid
is added to the attributes of the model.
2017-04-24 23:18:04 +08:00
wing328
aa85468932 remove trailing space in cpprest, update samples 2017-04-24 22:45:16 +08:00
Martin Brown
fc2b3d49ea Issue 4632 (#4803)
* Updated the Petstore samples

* This change uses std::stringstream for string conversions instead of std::to_string(). Android doesn't yet support std::to_string(). This should fix #4632
2017-04-24 22:27:51 +08:00
wing328
59801d5167 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-24 21:35:38 +08:00
wing328
176b6829c4 add back toString to form parameters in ts angular2 (#5457) 2017-04-24 18:44:49 +08:00
Phillip Novess
7282ad2d6a updated to place environment files in the correct location (#5168) 2017-04-24 18:37:37 +08:00
Phillip Novess
a2080810f8 updated to fix issue #5053 (#5057)
* updated to fix issue #5053

* updated test
2017-04-24 18:16:10 +08:00
wing328
e969b35ea2 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-24 18:07:17 +08:00
wing328
d9026c67aa remove carriage return in resteasy java files 2017-04-24 17:44:27 +08:00
wing328
f09372e2ec replace tab with spaces 2017-04-24 17:27:07 +08:00
wing328
640b16b58a Merge branch 'master' into master 2017-04-24 17:00:27 +08:00
nbruno
ddc309ec19 Add support for Spring's RestTemplate in Java client codegen (#5404)
* Add support for Spring's RestTemplate in Java client codegen

Resolves #1176

* Update all Java samples to include change for Jackson enums

Currently enums are deserialized from a String value with an
explicit @JsonCreator. However, they are not being serialized with
this String value. This change introduces the @JsonValue annotation
on the toString() method of enums, so they will be serialized as a
String with the correct value.
2017-04-24 14:40:47 +08:00
wing328
0c5cc4621a Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-23 23:07:28 +08:00
Tomek Cejner
f110072ef1 [swift] Open buildHeaders() and requestBuilderFactory property to allow extension. (#5225) 2017-04-23 23:02:21 +08:00
wing328
c8d9450db5 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-23 22:46:10 +08:00
wing328
1277db61bd [Ruby] add generator version to Ruby template (#5459)
* add generator version to ruby template

* remove tab in java generator
2017-04-23 22:41:56 +08:00
wing328
ee5c1b203b fix typo: lamda -> lambda 2017-04-23 22:28:29 +08:00
Rik Sprenkels
bd8b2d37c0 Fixes for swagger.json to Java escaping. (#5247) 2017-04-23 19:10:25 +08:00
wing328
397b440e60 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-23 18:36:37 +08:00
Xin Meng
c3d51357a8 fix the typescript angular 2 http request option issue #5374 (#5380)
* fix the typescript angular 2 http request option issue #5374

https://github.com/swagger-api/swagger-codegen/issues/5374

add `withCredentials:true` to the request option

*  run ./bin/typescript-angular2-petstore-all.sh to update Petstore samples
2017-04-23 18:31:00 +08:00
manuc66
d869051fb8 Fix Possible null pointer dereference (#5370) 2017-04-23 18:10:25 +08:00
Ian White
26fa547fd2 typescript-angular2: ensuring that dates are strings and datetimes are Dates (#5417) 2017-04-23 17:44:40 +08:00
wing328
f7cbb2c0e6 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-23 15:26:15 +08:00
antihax
3ed1aa8e79 Rewrite of Go Client #2 (#5037)
* Rewrite of Go Client

* Revert to older version of context.Context

* Clean and bulk up concurrency test.

* Correct {{path}} to {{{path}}}

* change custom date type to string.

* Add APIKey authentication

* Correct missing line from resolving conflicts.

Correct missing line from resolving conflicts.
2017-04-22 01:17:18 +08:00
Sergey Novikov
6685f18e5f Reuse allowed values (#5435) 2017-04-22 00:30:52 +08:00
Ravi
e9a438b73f [CppRest] Overload toJson for bool in Modelbase (#5448)
* Add operationId in exception message

* add number data type mapping

* fix_issue5434
2017-04-21 22:20:46 +08:00
Mario
f61e0d4024 Add RuntimeException option (#5405)
* add option to change Exception to RuntimeException

* rename propertie
remove space in template
2017-04-21 22:13:57 +08:00
Cas Perl
122db78b1a Issue 5375 (#5403)
* use py3 instead of py34

* fixed test to test invalid enum

* ADDED: assign variable in the ctor with property setter to check validity if possible. CHANGE: move required property check to proper place. CHANGE: remove double quotes from allowed_values for none-string enum property

* rebuilt samples

* comment for improvement

* ADDED: post process enum model for python.

* comment

* rebuilt samples

* rebuilt samples
2017-04-21 22:05:54 +08:00
Jean-Maxime Fillau
8144ab6870 Add json format in case contentType is application/json. (#5427)
Signed-off-by: FILLAU Jean-Maxime <jean-maxime.fillau@mapotempo.com>
2017-04-21 22:01:37 +08:00
Tony Tam
247be2f140 fix cache skip 2017-04-20 16:51:15 -07:00
Tony Tam
456b54b24f fix cache skip 2017-04-20 16:49:58 -07:00
Tony Tam
6ea4b4d6f3 fixes #5446 2017-04-20 10:32:27 -07:00
Tony Tam
0382f39780 disable cache 2017-04-20 10:29:12 -07:00
Tony Tam
aff529c0a9 updated index file for new editor 2017-04-20 10:29:06 -07:00
Tony Tam
c6ee8226a2 updated base image 2017-04-20 10:15:20 -07:00
Julien Fouilhé
edb80df0ba fix(swift3): fix infinite loop with inheritance and check if parent decoder exists before calling (#5416) 2017-04-20 22:54:35 +08:00
Julien Fouilhé
c65e663a11 fix(swift3): decoders call parents decoders too (#5433) 2017-04-20 22:54:01 +08:00
wing328
6359c064f3 Merge pull request #5250 from auchri/patch-1
[JAVA] Update gradle and android build tools
2017-04-19 15:57:14 +08:00
wing328
813949dd00 add lamda to clean up examples, fix spring tempalate format 2017-04-18 18:14:00 +08:00
Christoph Auer
70e4dad72e java/lib/retrofit2: Fix indent 2017-04-18 11:53:30 +02:00
Christoph Auer
9640e30f48 Update java/lib/okhttp-gson 2017-04-18 11:53:30 +02:00
Christoph Auer
4b88374df4 Update java/lib/retrofit2 2017-04-18 11:53:29 +02:00
Christoph Auer
ca87a4b817 Update java/lib/retrofit 2017-04-18 11:53:29 +02:00
Christoph Auer
5b475bcb16 Java/feign: Remove spaces at empty lines 2017-04-18 11:53:29 +02:00
Christoph Auer
83e902ba3f Update java/lib/jersey2 2017-04-18 11:53:29 +02:00
Christoph Auer
b2674feb14 Java: Remove spaces at empty lines 2017-04-18 11:53:29 +02:00
Christoph Auer
85a58f3414 Update Java/lib/feign 2017-04-18 11:53:29 +02:00
Christoph Auer
9652ce37f7 Update android/lib/volley 2017-04-18 11:53:29 +02:00
Christoph Auer
84dc2e1dd9 Update android 2017-04-18 11:53:29 +02:00
Christoph
71b12636e4 [JAVA] Update gradle and android build tools 2017-04-18 11:53:28 +02:00
Benjamin Douglas
07ba1eb6f8 Fixup generation of Javascript samples
The generation code was ignoring top-level aliases for any language config that
contained "java", which included "javascript", a completely different language.

Changed this to be those configs based on the JavaAbstractGenerator class.
2017-04-17 17:50:01 -07:00
Benjamin Douglas
9058099e5b Add alias type definitions for Java
When a spec defines a Model at the top level that is a non-aggretate type (such
as string, number or boolean), it essentially represents an alias for the simple
type. For example, the following spec snippet creates an alias of the boolean
type that for all intents and purposes acts just like a regular boolean.

    definitions:
      JustABoolean:
        type: boolean

This can be modeled in some languages through built-in mechanisms, such as
typedefs in C++. Java, however, just not have a clean way of representing this.

This change introduces an internal mechanism for representing aliases. It
maintains a map in DefaultCodegen that tracks these types of definitions, and
wherever it sees the "JustABoolean" type in the spec, it generates code that
uses the built-in "Boolean" instead.

This functionality currenlty only applies to Java, but could be extended to
other languages later.

The change adds a few examples of this to the fake endpoint spec for testing,
which means all of the samples change as well.
2017-04-17 12:58:31 -07:00
wing328
a17e80dfb1 minor fix to spring use of examples 2017-04-18 01:42:29 +08:00
wing328
3ca77d3cf2 Merge branch 'issue-5310' of https://github.com/elizabetht/swagger-codegen into elizabetht-issue-5310 2017-04-18 00:52:52 +08:00
Julien Fouilhé
b1a39ac820 fix(swift3): decoders call parents decoders too (#5369) 2017-04-18 00:03:52 +08:00
wing328
ba32f66714 Merge branch 'spring-resource-file-streams' of https://github.com/LEgregius/swagger-codegen into LEgregius-spring-resource-file-streams2 2017-04-17 23:26:09 +08:00
wing328
c7ccb1a9a9 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-17 23:05:46 +08:00
Eric Bélanger
fd289ac6de [JavaSpring] add support for map minProperties and maxProperties bean validation (#5395) 2017-04-17 22:47:21 +08:00
Tino Fuhrmann
e858f2390b [TypeScript] fix class filename in import/export (#5396)
* Fixed classFilename in typescript-angular and recreated samples

* Changed classname to classFilename in ts-angular2/models.mustache
Also recreated ts-angular2 sample
2017-04-17 22:43:33 +08:00
Elizabeth Thomas
ec4b3307fe Merge pull request #1 from elizabetht/master
Elizabeth/Joy - adding example support if specified in the swagger spec
2017-04-13 10:02:23 -05:00
Thomas, Elizabeth-CW
02bcad36fd Elizabeth/Joy - adding example support if specified in the swagger spec 2017-04-13 09:31:07 -05:00
Mike Kistler
ca9fcd7db1 Fix copy method of CodegenParameter to copy isPrimitiveType (#5381) 2017-04-13 20:58:55 +08:00
wing328
4e6a342c13 replace tab with 4-space in spring templates (#5389) 2017-04-13 19:03:34 +08:00
wing328
50c6f87d98 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-13 17:48:34 +08:00
dhuning
8cf0f7046e Adds @Valid to request body for the JavaSpring (#4850)
* Adds Valid annotation for request body (#4847)

If useBeanValidation is active, this change will add Valid annotation to ReqeustBody

* Adds generated samples for bean vaildation in spring boot (#4847)

* Adds Valid import to Controller

* Adds generated code for bean validation change
2017-04-13 17:42:02 +08:00
Benjamin Douglas
ab69ce5dc3 Add null pointer check to add/put methods (#5385) (#5386)
Commit e3d04ee01 (issue #5240) introduced unsafe add/put methods for optional
list/map parameters. This change maintains the spirit of issue #5240 (optional
containers are null by default) while still making add/put calls safe. It does
this by checking for null first and, if so, initializing it with an empty
container.

Also updated the affected samples using the various scripts in bin/.
2017-04-13 17:37:49 +08:00
Jean-Maxime Fillau
df1055fe38 Add float conversion for cpprest api client template. (#5387)
Signed-off-by: FILLAU Jean-Maxime <jean-maxime.fillau@mapotempo.com>
2017-04-13 17:30:20 +08:00
wing328
942c77b530 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-12 22:11:52 +08:00
Gayathri
a774ff9587 Latest from master - merge conflict resolution 2017-04-12 09:03:54 -05:00
nikitozz
78c4928908 Fixes #5367. Async support is enabled for .NET netstandard API clients (#5368) 2017-04-12 10:39:42 +08:00
wing328
1f4261d20b Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-11 22:29:28 +08:00
wing328
1fdd3e6ffa [Java][Spring] fix enum allowable values in Spring generators (#5364)
* fix enum allowable values in spring generators

* use values instead of enumVars in spring annoation
2017-04-11 22:23:09 +08:00
wing328
e3d04ee01f [Java] remove initialization for optional list property (#5363)
* set list to null in java if not required

* update petstore sample for java server stub

* update sample for msf4j

* add null assignment to new list/map in java
2017-04-11 19:07:48 +08:00
Michael Kourlas
0e65f649bc [JavaScript] Fix for issue #5358: Regression in 2.3 using multi parameters (Cannot read property 'buildCollectionParam' of undefined) (#5362)
* Fix for issue #5358

* Update tests for #5358
2017-04-11 17:52:32 +08:00
wing328
2d0c8c4060 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-11 01:03:28 +08:00
wing328
d3ac4b686a fix CI issue by declaring originalEnvironmentVariables as a protected
member
2017-04-11 00:57:22 +08:00
wing328
7662924ce1 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-10 23:32:06 +08:00
Simon Marti
1734ac4ed0 Add option to skip Maven plugin execution (#5337)
* Add option to skip Maven plugin execution

The execution is skipped if either the codegen.skip property or the <skip>
configuration parameter is set. This is consistent with how many other Maven
plugins, such as maven-exec-plugin and maven-clean-plugin, handle this.

* Add documentation for Maven `skip` property
2017-04-10 23:31:58 +08:00
Simon Marti
fea8699d8b Fix environment variable support in successive Maven plugin executions (#5351)
* Fix environment variable support in successive Maven plugin executions

System properties were retained across multiple successive executions,
resulting in unpredictable behavior. Property values are now properly reset
to their original value after plugin execution.

Fixes #5350

* Add explanation to environment variable reset mechanism in Maven plugin
2017-04-10 23:25:09 +08:00
Jean-François Côté
2e46bb9b9f Add File support + some fixes to Play generator (#5263)
* First commit of the Java Play Framework server generator. It is highly based on Spring so there might me a couple of things that don't make sense (like options or parameters) for the Play Framework.

* Fix suggestions in the PR discussion + add .bat and .sh file as requested.

* Updated Readme.md file

* Remove unused mustache file + fix baseName vs paramName in all the mustache files.

* Fix the compilation error when we have a body which is a list or map. Doesn't fix the problem with the annotation itself.

* Fix the problem with the Http.MultipartFormData.FilePart

* Return a FileInputStream when the returnType is "file" + Fix a couple of other bugs with boolean + updated sample

* Return an InputStream instead of FileInputStream (except in the instantiation)

* A little cleanup for the form param of type file.
2017-04-10 23:23:28 +08:00
wing328
7991cf75ae Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-10 23:21:36 +08:00
Vincent Giersch
aef98f464e fix(php): should not check enum value if not unspecified and optional (broken since #4886) (#5357)
Signed-off-by: Vincent Giersch <vincent@giersch.fr>
2017-04-10 23:21:14 +08:00
Vincent Giersch
99f0ab496b fix(php): escape reserved words in enum variables names (#5356)
Signed-off-by: Vincent Giersch <vincent@giersch.fr>
2017-04-10 23:19:06 +08:00
tbe
d59ac2ae65 [Perl] remove singleton (#5353)
- removed Singleton from ApiClient

fixes #5336
2017-04-10 22:52:32 +08:00
Ahmet Taha Sakar
c6959b0d21 Swift3 headers (#5340)
* added headers to makeRequest function for swift3 template

* petstore update
2017-04-10 22:36:22 +08:00
wing328
c35fdc3bda Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-10 14:39:48 +08:00
wing328
8dbdc31ba7 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-08 00:29:26 +08:00
anuthebananu
19d5e74dbd [Spring] Adds serialVersionUID to serializable model POJO's (#5347) 2017-04-07 09:17:29 +08:00
Johannes
e147fdec48 swagger-codegen-maven-plugin: hint added how to generate server code (#5342)
addresses issue #5332
2017-04-07 08:46:42 +08:00
wing328
4aaf3ab353 update reserved word list for swift3 (#5348) 2017-04-07 08:36:02 +08:00
lukoyanov
a7652d508d Updated CallAdapter & CallAdapterFactory for retrofit 2.2.0 (#5345) 2017-04-07 07:35:47 +08:00
wing328
6c745596d4 add beta to help text in scala client 2017-04-06 22:21:58 +08:00
wing328
627598fcc7 Merge remote-tracking branch 'origin' into 2.3.0 2017-04-06 17:01:49 +08:00
wing328
fd57b4c164 Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2017-04-06 17:01:39 +08:00
wing328
90b14a996a use original value of paramName in akka scala templates (#5339) 2017-04-06 17:01:25 +08:00
baartosz
13cccccb67 fixed error handling in async requests in python client (#5308) 2017-04-06 16:55:53 +08:00
wing328
4582cd874d Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-06 16:20:18 +08:00
weiyang
abffdca441 [Html2] Fix circular references (#5313)
* [html2] Fix circular references

Signed-off-by: weiyang <weiyang.ones@gmail.com>

* [samples][html2] Fix circular references

Signed-off-by: weiyang <weiyang.ones@gmail.com>

* Optimize code format

Signed-off-by: weiyang <weiyang.ones@gmail.com>
2017-04-06 14:39:26 +08:00
wing328
ad2552ace6 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-04 15:27:17 +08:00
Ian O'Neill
f303183b44 [JaxrsResteasy] Fix JacksonConfig package and RestApplication imports (#5302) (#5303)
This is for the EAP version specifically.

* The JacksonConfig class always used the io.swagger.api package
* The RestApplication class did not import the service implementations
  from the correct package
* Added shell script for generating test applications
2017-04-04 00:43:40 +08:00
wing328
c5e6401b89 fix C# api client template for multi query parameter support 2017-04-03 16:55:55 +08:00
wing328
5453d61a4c fix PrepareRequest method signature 2017-04-03 16:45:32 +08:00
Sean O'Hare
f102d675d6 Initial commit to support "multi" formatted collections as query strings in csharp. 2017-04-03 16:36:29 +08:00
wing328
3f8f13e3fd Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-03 15:49:44 +08:00
wing328
e5b3e3cdac replace tab with 4space for ts jquery client (#5299) 2017-04-03 15:48:51 +08:00
baartosz
2315ef2a7f Php client using guzzle6 & psr7 instead of curl (#5190)
* reimplemented basic requests with httpplug

* added returning headers

* added query params support

* removed constant reference to model class

* some extra @throws; form params

* form and query params encoding

* file upload / form multipart

* added missing response headers in WithHttpInfo calls

* removed Store test From PetApiTest class

* removed configuration overriding test as its now task of client adapters

* updated store tests with new client initialization code

* updated composer.json template

* not using json_decode if response is string

* renamed some variables to camelCase

* removed ApiClient and Configuration classes

* added HeaderSelector template

* added ObjectSerializer injection

* regenerated all samples

* added AuthConfig and readded support for custom api keys

* readded support for oauth tokens

* readded basic auth; moved auth tests to separate test class

* readded header params

* readded support for collections in paths

* readded  config option; readded exception handling

* file downloading; readded some Configuration properties removed earlier

* readded default headers

* made responses and return types work same way as earlier

* made all methods static in ObjectSerializer

* updated test.php, replaced autoload.php with composer's autoloader

* updated api doc template

* removed classes used for testing; regenerated Fake_classname_tags123Api

* replaced httplug with guzzle6

* updated required php version to 5.5

* clean up

* readded missing userAgent feature; removed default headers from Configuration

* updated test.php

* downgraded phpunit back to 4.8 to work with php5.5; fixed client initialization in some tests
2017-04-03 15:47:57 +08:00
clasnake
39bd0175b7 Pr4855 cherrypick (#5115)
* Add async support to scala client.

* Format api endpoints.

* Modify build.sbt.

* Change date format and pass StoreApis tests.

* Add StringReader and StringWriter to support string serialization/deserialization.

* update petstore samples for scala clients

* Update maven and gradle dependency. Update tests to pass compilation.
2017-04-03 15:01:43 +08:00
wing328
cf8a9a0de0 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-03 14:54:50 +08:00
wing328
7db3388fdc Update maven compiler plugin to the latest version (3.6.1) (#5300)
* update maven compiler plugin to the latest version

* update feign petstore
2017-04-02 21:39:48 +08:00
wing328
2e8eea9c18 add logic to camelize path variables for feign client (#5301) 2017-04-02 19:01:43 +08:00
wing328
4916142450 Merge remote-tracking branch 'origin' into 2.3.0 2017-04-02 16:06:33 +08:00
wing328
071c012f85 Replace tab with 4 space in Java files (#5298)
* replace tab with 4 space in java files

* revise error message in shell script

* print result before checking

* revise grep expression
2017-04-02 16:05:40 +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
wing328
dea01c6b70 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-01 21:14:16 +08:00
wing328
bc8e16e3f8 fix package name in mono test script (#5278) 2017-04-01 21:12:17 +08:00
wing328
bfa18a0ce8 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-01 16:39:54 +08:00
Granjow
64c7e23a04 TypeScript client API: Add public getter/setter for base path (#5270) 2017-04-01 16:33:29 +08:00
zszugyi
22eb72791c Specify copy option to overwrite existing temp file, otherwise Files.copy throws FileAlreadyExistsException (#5268) 2017-04-01 16:11:00 +08:00
Griffin Schneider
5de19e3214 [Swift3] Fix bug where non-camel-case path params didn't work. (#5267)
* [Swift3] Fix bug where non-camel-case path params didn't work.

* [Swift3] Fix bug where int enums generated non-compiling code. Swift3 integration tests now pass.

* [Swift3] Add a non-camel-case path parameter to petstore-with-fake-endpoints-models-for-testing. This would have caused the Swift3 tests to be broken before 7387e49fef56a624045aa52b65ffb9c19b3853ec.
2017-04-01 16:06:31 +08:00
wing328
22fcea1c91 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-04-01 15:57:43 +08:00
Benjamin Douglas
5c3fe23e9f Support Swagger collectionFormat encodings in Feign (#5266)
* Support Swagger collectionFormat encodings in Feign

Feign only natively supports the "multi" collectionFormat for encoding lists
of parameter values. This change adds manual encoding of the other formats, such
as "csv" (the default for collections), "tsv", space-separated, and pipes.

* Fix typo in anchor tag.
2017-04-01 15:33:20 +08:00
wing328
21da8b6d9c Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-31 22:46:31 +08:00
JC Casas
909f392745 fix mustache file for build.bat (#5264)
replace IO.Swagger for {{packageName}} where necessary
2017-03-31 16:30:40 +08:00
David Guthrie
aa773dc7fd Resource stream for file is no longer an option, it's the default for Spring 2017-03-30 12:34:22 -04:00
Sebastian Mandrean
7cc20cbeba [C#][aspnetcore] Improve generated code (#5257)
* Migrate from Swashbuckle to Swashbuckle.AspNetCore

* Fix typo

* Add SwaggerResponse for all responses

* Remove model constructor

* Add required attribute if available

* Improve whitespace and remove some redundant code

* Remove redundant code from Dockerfile

* Add disable warning 1591 pragma for model utility methods for bringing down compiler warnings to zero

* Add proper model state validation before controller is called

* Regenerate AspNetCore PetStore sample
2017-03-30 22:58:25 +08:00
wing328
c9182ba00f Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-30 22:49:11 +08:00
niku
4e1d9ea010 [Elixir] Add documentation for functions (#5260) 2017-03-30 22:45:39 +08:00
wing328
0baa6cf0e8 Merge branch 'nodejs-server-improvements' of https://github.com/Granjow/swagger-codegen into Granjow-nodejs-server-improvements 2017-03-30 22:31:17 +08:00
Usman Iqbal
833db27101 [Typescript - Angular2] Add support for multiple API Keys (#5236)
# Conflicts:
#	modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
#	samples/client/petstore/typescript-angular2/default/configuration.ts
#	samples/client/petstore/typescript-angular2/npm/configuration.ts
2017-03-30 22:27:39 +08:00
David Harrigan
fc01457d77 [JAVA][#5172] Allow vendor json media types (#5189)
* [#5172] Allow vendor json media types

* Revert unnecessary diffs

* Update petstore sample

* Didn't run mvn after some edits

* Rerun ' ./bin/java-petstore-all.sh' and './bin/security/java-petstore-okhttp-gson.sh'

* Added more realistic test cases for isJsonMime
2017-03-30 22:23:24 +08:00
wing328
e4ca7744df Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-30 17:36:35 +08:00
wing328
040a25cc9b fix typo in c# generator's help text 2017-03-30 10:22:13 +08:00
wing328
ad4de91d92 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-30 09:57:07 +08:00
Paŭlo Ebermann
2830fb1794 [JaxRS Server][Jersey1/2] Pass server port by cli (#5246)
* JaxRS server: set serverPort only when not given from outside.

* Update JaxRS sample creator scripts to fix serverPort.

* Preliminary test fix for JaxRS server generators.

* Updating samples for JaxRS with Jersey1/2.
2017-03-30 01:26:37 +08:00
wing328
8f37e68049 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-29 17:25:10 +08:00
wing328
996acc05f5 [Java][Retrofit2] update gradle, sbt build file with latest dependencies (#5238)
* update build.gradle for retrofit2

* update retrofit2 rx2 sample

* update gradle and sbt build file for retrofit2
2017-03-28 21:05:12 +08:00
Simon A. Eugster
99fd1b2281 Use __dirname for paths if server is started from a different directory 2017-03-28 13:31:47 +02:00
wing328
55e648c0b1 update retrofit2 dependencies (#5235) 2017-03-28 18:50:24 +08:00
Paŭlo Ebermann
dd883e4125 Issue #3084: remove timestamps from undertow samples (#5231)
* Issue #3084: Support hideGenerationTimestamp for Undertow.

* Issue #3084: disable timestamp generation for undertow samples.

* Update samples for Undertow.
2017-03-28 16:55:08 +08:00
wing328
39fb77ad3e Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-28 16:46:44 +08:00
wing328
32e9e7f63e add port 80 to swagger spec (#5232) 2017-03-28 16:46:29 +08:00
wing328
e41dd761b5 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-28 10:37:19 +08:00
wing328
d68859cfbc fix c# docstring typo (#5223) 2017-03-27 18:06:34 +08:00
wing328
b32fe8230a fix retrofit2 indentation (#5221) 2017-03-27 17:21:45 +08:00
wing328
f4d1261522 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-27 16:05:44 +08:00
Todd
3849d64c24 export top level enumeration types in typescript-fetch mode (#4820)
This change enables top level enumeratons to be written out as:

export type SortDirection = "Ascending" | "Descending";

vs.

export class SortDirection {
}
2017-03-27 15:15:36 +08:00
Paŭlo Ebermann
ec6248cbcf [Erlang] pretty print swagger json (#5215)
* Pretty-print swagger.json.

(This was done via `jq`. In a later commit we'll generate it pretty-printed.)

* Erlang Server: pretty-print generated swagger.json.

* Update samples for Erlang-server.
2017-03-27 14:50:17 +08:00
wing328
1a1f5afddc add ci test for msf4j server (#5220) 2017-03-27 14:37:42 +08:00
Paŭlo Ebermann
6fef9c5ce6 [java][msf4j] Update msf4j samples (and fix artifact name) (#5210)
* Fix MSF4J pom indentation.

* Set MSF4J sample artifactId in the generator script.

* Update MSF4J samples.
2017-03-27 14:09:36 +08:00
Paŭlo Ebermann
9875855f63 [ASP.NET] Issue #5196: add packageGuid parameter to AspNetCoreServerCodegen. (#5199)
* Issue #5196: add packageUid parameter to AspNetCoreServerCodeGen.

* Change .bat file, too.
2017-03-27 13:20:24 +08:00
Paŭlo Ebermann
9dfbe7ef85 [nancyfx] Issue #5196: make package GUID nonrandom for nancyfx samples (#5209)
* Add packageGuid parameter to NancyFxServerCodegen.

* Use packageGuid parameter for nancyfx petstore samples.
2017-03-27 13:19:13 +08:00
wing328
05a3c8d5df Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-27 12:01:56 +08:00
Paŭlo Ebermann
f0b9c2b761 [Go] #3084: remove timestamps from go server (#5218)
* Issue #3084: add hideGenerationTimestamp option to Go server generator.

* Issue #3084: use hideGenerationTimestamp in go server sample script.

* Update Go server samples.
2017-03-27 11:47:15 +08:00
wing328
b37a7c81b0 add comments to csharp methods (#5206) 2017-03-27 11:43:14 +08:00
wing328
7e5f65340e Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-26 23:19:25 +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
wing328
20cc80d170 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-26 23:05:46 +08:00
Paŭlo Ebermann
c812d81e9a Issue #3084: remove timestamps from bash samples. (#5192) 2017-03-26 22:56:34 +08:00
wing328
9acefcffdd Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-26 22:54:17 +08:00
Julien Dupouy
e50e653e3d Binary support for javascript client (#5194) 2017-03-26 22:53:35 +08:00
Paŭlo Ebermann
a9c7030997 Issue #3084: hide generation timestamp for HTML2 samples. (#5193) 2017-03-26 22:49:12 +08:00
wing328
41a505a1f8 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-25 14:37:59 +08:00
Jean-François Côté
282b22744c [Java][PlayFramework] Added some CLI Options + many fixes (#5180)
* First commit of the Java Play Framework server generator. It is highly based on Spring so there might me a couple of things that don't make sense (like options or parameters) for the Play Framework.

* Fix suggestions in the PR discussion + add .bat and .sh file as requested.

* Updated Readme.md file

* Remove unused mustache file + fix baseName vs paramName in all the mustache files.

* Fix the compilation error when we have a body which is a list or map. Doesn't fix the problem with the annotation itself.

* Fix the problem with the Http.MultipartFormData.FilePart

* - Add "wrapCalls" and "useSwaggerUI" CLI Options and updated what handleException does to follow Play Framework lifecycle more closely
- Updated all mustache files accordingly
- Updated the sample
- Updates Play Framework version to the latest 2.5.13
2017-03-25 14:36:01 +08:00
Benjamin Douglas
65b6660c55 Fixes a bug in #5142 for multi-word parameters (#5185)
In the convenience class defined for generating a Map of query parameters, the
parameter name was mistakenly being set to the Java variable name, not the
actual parameter name. These are often the same, but can be different in the
case of multi-word parameters, such as in the sample API's `enum_query_string`
vs `enumQueryString`.
2017-03-24 22:04:11 +08:00
Tony Tam
417b69b98c fix for #5182 2017-03-23 11:02:53 -07:00
Tony Tam
b3b392dc79 updated inflector version to latest 2017-03-23 11:02:43 -07:00
Joseph Moore
b7fc11b089 Modify retrofit OAuth templates for #5039 (#5082)
The updateAccessToken method returns `true` when it means `false` and
vice versa.
2017-03-23 23:27:04 +08:00
David Guthrie
58d4187054 Added a new additional option that allows one to replace the the 'file' generated class with org.springframework.core.io.Resource, which will allow returing file data from Urls or anything that can be converted to a stream. 2017-03-23 11:25:08 -04:00
wing328
d4336bd294 sync swagger codegen pom.xml to 2.3.0 2017-03-23 19:42:16 +08:00
wing328
8aceed7557 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-23 18:26:07 +08:00
wing328
8fbe82a66b replace tab with 4 spaces (#5174) 2017-03-23 17:18:01 +08:00
wing328
aa3a5c6347 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-23 16:54:49 +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
David Biesack
5f27fcab18 Add support for Markdown in -l html (#5144)
* Sync with upstream/master

* Support Markdown in -l html

Add https://github.com/atlassian/commonmark-java to modules/swagger-codegen to convert Markdown to HTML,
update StaticHtmlGenerator to use this (see the toHeml() method and its uses)

Add a new test case bin/html-markdown.sh and
modules/swagger-codegen/src/test/resources/2_0/markdown.yaml

* Support Markdown in -l html

Add https://github.com/atlassian/commonmark-java to modules/swagger-codegen to convert Markdown to HTML,
update StaticHtmlGenerator to use this (see the toHeml() method and its uses)

Add a new test case bin/html-markdown.sh and
modules/swagger-codegen/src/test/resources/2_0/markdown.yaml
2017-03-23 15:15:01 +08:00
Benjamin Douglas
55b7db3456 #5142: Add @QueryMap support for Feign API (#5143)
* use builder pattern for operations

* @QueryMap parameter only for query parameters

The previous iteration had replaced all parameters (body, path, query, etc)
within a single @QueryMap. But Feign only supports this style of parameter
passing for query parameters. Besides, for the case of a body parameter (like
soxhlet uses) it only added extra verbosity. With this change, the query
parameters are gathered together in a single @QueryMap and the other parameters
are left alone.

* Adding template for generating test code

* Make javadoc consistent with rest of file's conventions/indents

* Update samples

The files in src/main were generated by running

  $ bin/java-petstore-feign.sh

The files in src/test were manually fixed.

* Correct capitalization of @QueryMap class in feign

Adds a field operationIdCamelCase (a la operationIdLowerCase) to the
CodegenOperation container and uses it in the feign-generated classes
with @QueryMap parameters. Also re-generated the feign samples.

* Adding hyphen to javadocs for extra readability.

* Adding (not replacing) api method with @QueryParam overload.

In order to keep backwards compatibility, switched to adding a new method to
the interface instead of replacing the old call.

* Adding newline to generated source for readability.
2017-03-23 15:01:07 +08:00
wing328
bd81dfd08e use base name for parameters in the curl command (#5173) 2017-03-23 14:51:00 +08:00
wing328
004cf6611e Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-23 14:15:10 +08:00
wing328
264c9d615f use unescaped path in server stub templates (#5157) 2017-03-23 11:59:04 +08:00
Simon Marti
375e34fe12 Fix selective generation in successive Maven plugin executions (#5152)
Options passed as system properties are properly reset when
disabled in the execution configuration.

Fixes #5151
2017-03-23 00:49:57 +08:00
wing328
bf7a2b22cd Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2017-03-22 23:03:20 +08:00
wing328
c206086abe Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-22 23:03:02 +08:00
wing328
2b0efda3bd [Java][Play] Remove swagger play dependency, cleanup (#5159)
* First commit of the Java Play Framework server generator. It is highly based on Spring so there might me a couple of things that don't make sense (like options or parameters) for the Play Framework.

* Fix suggestions in the PR discussion + add .bat and .sh file as requested.

* Updated Readme.md file

* Remove unused mustache file + fix baseName vs paramName in all the mustache files.

* Add an CLI option to generate interface. These interfaces are implemented by the controllerImp and help to generate the code with an IDE like IntelliJ because on updates of the code the controllerImp must follow the contract of the interface. If it don't, IDE will provide support to generate missing functions or parameters. I also did some cleanup of options we don't use in Play Framework.

* Fix the compilation error when we have a body which is a list or map. Doesn't fix the problem with the annotation itself.

* Fix the problem with the Http.MultipartFormData.FilePart

* Small fixes

* Remove everything related to swagger-play. No need for annotation anymore because we export the swagger.json directly and show the documentation using swagger-ui with the direct path. Also added the sample.

* Remove/Rename paramsX mustache because there is no more documentation. Remove unused file. updated sample

* Fix the problem with default values that was not set correctly.

* Small fix related to bad merging

* Add handleException CLI options

* Fix default values once and for all!

* Update sample files + fix bug

* Fix bug with body that is required and have a list as a parameter + add bean import for interface to prevent compilation error
2017-03-22 23:00:30 +08:00
baartosz
8b891be7d7 [Python] remove singleton (#5012)
* updated tests relying on configuration's singleton

* regenerated samples

* removed singleton from templates

* regenerated samples

* removed broken sample and its test

* reverted accidental change

* regenerated security/ samples

* removed singleton from RESTClientObject

* removed unused Configuration import

* reverted unrelated change

* updated usage examples in api_doc template
2017-03-22 22:25:46 +08:00
wing328
bea9e265e9 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-22 20:52:26 +08:00
wing328
f064d29e82 Use unescaped path in API client templates (#5154)
* use unescaped path in api client templates

* use unescape basePath in API client templates
2017-03-22 20:49:06 +08:00
wing328
a4d4b0f0bd fix pattern in python flask (#5155) 2017-03-22 20:41:12 +08:00
wing328
df2f406849 update csharp generator help text (#5140) 2017-03-22 16:18:59 +08:00
wing328
1ee0f4fbad Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2017-03-22 16:06:22 +08:00
wing328
4f6b3bd48b Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-22 15:55:56 +08:00
wing328
1c329483e4 [TypeScript] fix class filename in TS Angular2 template (#5131)
* fix class filename in ts angular2 template

* remove trailing comma in ts angular2 template
2017-03-21 23:48:35 +08:00
wing328
52e42701bd Merge branch 'master' of https://github.com/techlogix/swagger-codegen into techlogix-master 2017-03-21 23:29:08 +08:00
Fábio Franco Uechi
0afa084158 Add docker support to python flask (#5133)
* added supporting files for Dockerfile and dockerignore generation for python-flask lang

* documenting how to build the docker image and how to spin up a container

* updating pet store sample
2017-03-21 23:21:53 +08:00
Yao Yao
d217c5c1fd add json-formatter-js library. (#5125) 2017-03-21 21:44:28 +08:00
wing328
3ebee288ad add back missing changes from #4539 (#5109) 2017-03-21 16:17:28 +08:00
Ben Herila
42a7110d90 Fix Bug/4952 by explicitly implementing IValidatableObject (#4954)
* Explicitly implement IValidatableObject interface to avoid conflict with potential ValidationResult classes

* Missed one

* Rebuilt tests
2017-03-21 15:57:56 +08:00
Sebastian Mandrean
58198939c7 [C#][aspnetcore] Fix broken Docker build option & documentation (#5128)
* Use lower-case packageName for README.md docker build example

* Use dotnet:1.0.3-sdk instead of just "latest"

* Regenerate Petstore server sample
2017-03-21 14:39:24 +08:00
Paul English
59fe50dd74 Ensure identifiers get sanitized; Ensure model names also have the same formatting (#5098) 2017-03-21 14:35:38 +08:00
wing328
439563bd70 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-21 14:30:10 +08:00
Fábio Franco Uechi
7325650f2d solves issue #4752 (#5127) 2017-03-21 14:25:10 +08:00
fumito_ito
c1a9b7313e fix #2159 dataformatter error for iOS Swift (#5008)
* fix #2159 dataformatter error for iOS Swift

When trying to parse 24-hour time to 12-hour time, date formatter throws fatal error.
It's caused by lack of settings locale for date formatter.

* update sample code
2017-03-21 14:22:18 +08:00
wing328
6fe38e8383 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-20 22:12:57 +08:00
eblis
21657f80cf Not using files from template folders with libraries inside them (#4628)
* #4627 - When looking for template files also look in the libraries subfolder of the supplied templateFolder, before checking the embedded locations.

* Reworked the order in which template files are searched for:
 - 1st the code will check if there's a <template folder>/libraries/<library> folder containing the file
 - 2nd it will check for the file in the specified <template folder> folder
 - 3rd it will check if there's an <embedded template>/libraries/<library> folder containing the file
 - 4th and last it will assume the file is in <embedded template> folder.

 Added unit test to test template dir overloading.
2017-03-20 22:12:29 +08:00
wing328
321c7cb2ca Merge remote-tracking branch 'origin/master' into 2.3.0 2017-03-20 21:16:02 +08:00
Gronsak
580745ef43 [C#] Adding support for generating .NET Standard 1.3 client library (#4955)
* [CsharpNetStandard] Added C# .NET Standard Client Generation

Added language CsharpNetStandard.
Everything copied from csharp Client Generator.
Dependancies switched from Restsharp to Restsharp.Portable.
Changes made where nececary to replicate Restsharp functionallity.
Project type changed to .NET Standard protable library.

* [CsharpNetStandard] Removed client prop validation due to incompability

* [CsharpNetStandard] Minor fixes

Changed leftover RestSharp.Method to Method
Changed to .Net Standard 1.3 for compability reasons
Changed excludeTests to default to true due to tests not being implemented yet

Removed unnecessary targetFramework property
Removed leftover UWP stuff

* [CsharpNetStandard] More fixes

Added correct dependencies to Readme
Added correct supported frameworks to Readme
Added slightly better placeholder for installation instructions in Readme

Removed leftover dependencies from project.json
Removed leftover SupportsAsync stuff
Removed references to build.bat/-.sh since they're not yet being generated

Todo implement test generation

* [CsharpNetStandard] Added forgoten git_push.sh

* [C#-netstandard] Renamed option to csharp-netstandard

Also added .bat file for test generation

* [C# Net Standard] fixed path in .bat file

* [C# NET Standard] fixes to enum generation

Fixed issues with enum generation due to tired programmer

* [C# NET Standard] Generated sample client library

Sample library generated

Fixes:
Class actually works again
.bat - minor inconsistency fixed

* [C# NET Standard] Error corrected in how timeout is set

Configuration Timeout property changed to TimeSpan type and code corrected around that

* [C#] Merged .NET Standard generator into csharp generator

Functionallity of csharp-netstarndard generator has been moved into standard csharp generator under the targetFramework option as "v5.0"
2017-03-20 17:21:44 +08:00
Paŭlo Ebermann
d3f365fd29 Fix (partially) #4898 for elixir (#5021)
* fix (partially) #4898 for Elixir

* Update petstore samples (after fix for elixir for #4898)
2017-03-20 15:24:24 +08:00
wing328
08d4545947 Merge remote-tracking branch 'origin' into 2.3.0 2017-03-20 15:07:43 +08:00
foxx1337
090d80b42c [JAVA][jaxrs-spec] Add @DefaultValue for query parameters in API (#5023) (#5024)
This was previously missing and I don't think it was intentional.
It appears that swagger-codegen is already correctly processing
the yaml and the placeholder in the template was the only thing
missing.
2017-03-20 15:04:27 +08:00
wing328
f477ae83aa Merge remote-tracking branch 'origin' into 2.3.0 2017-03-19 15:56:30 +08:00
Oliver Teichmann
2d21bfa21c Updated feign library to use latest version of OpenFeign and Jackson. (#5114) 2017-03-19 15:15:06 +08:00
wing328
11d899c9cd Merge remote-tracking branch 'origin' into 2.3.0 2017-03-18 23:05:12 +08:00
wing328
eee5cc061c fix path with {{{ .. }}} in c# api mustache file (#5112) 2017-03-18 23:02:20 +08:00
jfiala
2048defe7b add jackson dependencies to pom for cxf-client #4924 (#5032) 2017-03-18 22:13:44 +08:00
rcilia
d5cb70f03e Swift3 enum: number variable names fix (#5060)
* Swift3 enum: number variable names fix

Swift3 generator: added 'number' prefix to enum variable names that start with a number

* Fixed Swift3 enum variable names starting with number (prefixed with '_') and added test cases

* Swift3 enum var names: made sure to keep the next word after a number in lower case
2017-03-18 17:29:52 +08:00
Paŭlo Ebermann
1b973d2c43 Update petstore samples for scala client. (#5092)
* Update petstore samples for scala client.

* Fix missing dependency problem.
2017-03-18 16:44:53 +08:00
wing328
9749585886 Merge remote-tracking branch 'origin' into 2.3.0 2017-03-18 15:47:15 +08:00
Brian Towles
0895e292c4 Add Selective Generation support to the Maven plugin. (#5036)
* Updated maven plugin to allow for selective generation

* Documentation of Selective generation options.
2017-03-18 15:46:10 +08:00
wing328
1010ecc8d5 Merge remote-tracking branch 'origin' into 2.3.0 2017-03-18 15:39:10 +08:00
wing328
98e8e55281 Merge pull request #5065 from ibm-bluemix-mobile-services/issue-4764
[Swift] Fix issue #4764
2017-03-17 21:53:44 +08:00
Sebastian Mandrean
5ed94a002c [Haskell] Fix broken client/server compilation errors (#5097)
* Remove dead legacy code

* Update cosmetics according to Haskell standard practices

* Fix failing pattern matching for lookupEither

* Bump to latest dependencies without any breaking changes

* Remove duplicate instance declarations already existing in Servant.API.Verbs

* Fix double Java/Haskell escapement bug

* Re-generate Petstore sample client/server
2017-03-17 16:55:11 +08:00
Tony Tam
9ddf28ff75 Update wordnik.yaml 2017-03-16 16:04:59 -07:00
Tony Tam
20580f9b1b Update wordnik.yaml 2017-03-16 16:01:34 -07:00
Paul Ebermann
c74eec27ca Merge branch 'update-scala-client-samples' into new-sync-master-to-2.3.0 2017-03-16 17:53:39 +01:00
Paul Ebermann
2ecb4955ff Fix missing dependency problem. 2017-03-16 17:50:07 +01:00
Paul Ebermann
21b70a2dad Fix broken okhttp-gson merge. 2017-03-16 14:49:49 +01:00
Paul Ebermann
f907af6f31 Merge branch 'master' into new-sync-master-to-2.3.0 2017-03-15 18:43:12 +01:00
wing328
917306aa10 override escape quotation mark in async scala generator (#5078) 2017-03-16 01:14:43 +08:00
Paul Ebermann
784169bc3f Merge branch 'master' into new-sync-master-to-2.3.0 2017-03-15 16:41:33 +01:00
Paul Ebermann
08ea36b13d Merge remote-tracking branch 'upstream/2.3.0' into new-sync-master-to-2.3.0 2017-03-15 16:34:27 +01:00
wing328
878b390ab6 Merge pull request #5049 from jostick/fix-scala-listbuffer
Fixes ListBuffer import-mapping for scala clients
2017-03-15 23:33:00 +08:00
wing328
c1f422b965 Merge pull request #5072 from swagger-api/sync_master_230
Sync master to 2.3.0 branch
2017-03-15 23:09:31 +08:00
Sebastian Mandrean
55508d9c24 [Haskell] Bump dependencies (#5061)
* Bump haskell-servant dependencies

* Update haskell-servant petstore sample
2017-03-15 17:42:08 +08:00
Paŭlo Ebermann
31f29be2a0 Use deterministic randomness in ExampleGenerator. (#5068)
* Update samples for nodejs + nodejs-google-cloud-functions.

* Fix example generator to use deterministic randomness.

This avoids changing results after each generation, and makes diff reviews easier.

* Update NodeJS samples.

This is the last "randomness" update. From now on the samples should only change if either the generator, the input or parameters change.
2017-03-15 17:15:13 +08:00
Matt Alleman
b2aa877ce0 Allow for UUID types in akka-scala (#5069)
* allow for UUID types

* update sample libs
2017-03-15 17:02:42 +08:00
Paŭlo Ebermann
e1b1edf958 Merge branch 'merge-2.3.0' into new-sync-master-to-2.3.0 2017-03-14 21:04:47 +01:00
Anthony Oliveri
88a755f368 [Swift] Detect file type in Swift codegen 2017-03-14 15:02:34 -05:00
Ben Herila
eea58c55b4 Add support for typescript-jquery (typescript-based API calls using jquery ajax in the browser) (#4953)
* Typescript jquery client wip

* typescript-jquery wip

* Fix typo

* typescript-jquery wip

* Fix formatting

* Petstore sample for typescript-jquery

* Petstore sample for typescript-jquery

* wip
2017-03-15 00:17:04 +08:00
Paul Ebermann
26b618241a Merge branch 'update-samples-for-sync_master_230' into merge-2.3.0 2017-03-14 13:11:24 +01:00
Tony Tam
61917723e1 matched key to actual value 2017-03-14 12:29:36 +01:00
Tony Tam
689b7321f7 added type check 2017-03-14 12:29:36 +01:00
Paŭlo Ebermann
9be178b26a Merge branch 'master' into new-sync-master-to-2.3.0 2017-03-13 21:42:41 +01:00
Paŭlo Ebermann
22de105895 Merge remote-tracking branch 'upstream/2.3.0' into merge-2.3.0 2017-03-13 21:26:39 +01:00
wing328
1f7374957e fix java retrofit2 apiclient due to bad merge 2017-03-14 01:11:50 +08:00