43 Commits

Author SHA1 Message Date
wing328
45ff39c237 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-05-10 18:04:49 +08:00
sabras75
824842290d Fix#5510 (#5582)
* Add overloads on signals.
The overload adds the NetworkError and the error string to the signal. Both signal will be emitted. Clients are supposed to subscribe to  only one of the overloads.

* refactor generated code alignement

* Do not use method overload for signals. Instead, have another naming convention for signal that carries Error information.
 Why ? Because signal overloading and QT5 connector with method referencing do not mix well (see http://stackoverflow.com/questions/16794695/connecting-overloaded-signals-and-slots-in-qt-5). It would need to specify exactly which overload to take. That is cumbersome to write AND is a breaking change for the consumer of the generated code.

* update qt5 sample files
2017-05-09 16:34:17 +08:00
wing328
413a00ef40 Merge remote-tracking branch 'origin/master' into 2.3.0 2017-05-03 00:09:14 +08:00
wing328
556be7dfd6 update qt5 c++ petstore samples 2017-04-28 22:47:05 +08:00
sabras75
994e4fd8ff Fix#5481 (#5499)
* Add CPP_NAMESPACE option

* update mustache template to exploit cppNamespace option

* update sample files

* correction : missing namespace replacement in template
2017-04-28 22:19:37 +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
Paŭlo Ebermann
200b10e2da Update samples for QT5. (#5216) 2017-03-27 11:48:16 +08:00
Paul Ebermann
5bb0f7a933 Update all samples. 2017-03-15 18:25:40 +01:00
wing328
acd10318f7 Merge remote-tracking branch 'origin' into sync_master_230 2017-02-10 23:31:36 +08:00
Tony Tam
62caf7dac5 rebuilt samples 2017-01-21 16:33:14 -08:00
William Cheng
ce899e3776 Merge remote-tracking branch 'origin/master' into 2.3.0
Conflicts:
	appveyor.yml
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
	modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
	modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
	modules/swagger-codegen/src/main/resources/go/api.mustache
	modules/swagger-codegen/src/main/resources/objc/api-body.mustache
	modules/swagger-codegen/src/main/resources/objc/api-header.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
	samples/client/petstore-security-test/typescript-angular2/configuration.ts
	samples/client/petstore/go/go-petstore/docs/FakeApi.md
	samples/client/petstore/go/go-petstore/fake_api.go
	samples/client/petstore/go/go-petstore/pet_api.go
	samples/client/petstore/java/feign/pom.xml
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/RFC3339DateFormat.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
	samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONResponseSerializer.h
	samples/client/petstore/qt5cpp/client/SWGPetApi.h
	samples/client/petstore/qt5cpp/client/SWGStoreApi.h
	samples/client/petstore/qt5cpp/client/SWGUserApi.h
	samples/client/petstore/typescript-angular2/default/configuration.ts
	samples/client/petstore/typescript-angular2/npm/README.md
	samples/client/petstore/typescript-angular2/npm/configuration.ts
	samples/client/petstore/typescript-angular2/npm/package.json
	samples/client/petstore/typescript-angular2/npm/tsconfig.json
	samples/client/petstore/typescript-fetch/builds/default/api.ts
	samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
	samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
	samples/client/petstore/typescript-fetch/tests/default/test/PetApiFactory.ts
	samples/client/petstore/typescript-fetch/tests/default/test/StoreApiFactory.ts
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
	samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java
2017-01-05 17:44:39 +08:00
wing328
90512e6326 Remove Apache license from API client generators (#4197)
* remove php apache license

* remove apache license from C#

* remove apache license in objc code

* remove license from swift 3 code

* remove apache license from perl code

* remove license from scala code

* remove license from ts, go, android, cpp, scala

* remove license from java api client

* restore clojure petstore files

* remove license from travis file

* clean up apache-related terms in php, ruby, python mustache tempaltes

* remove license from JS API cilent
2016-11-16 21:44:49 +08:00
wing328
af16601654 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-22 23:08:36 +08:00
Mathieu MARACHE
8bee0de4e9 [Qt5/C++] Arrays of primitive types fix (#4046)
* Corrects issue #3410 when trying to create Arrays of primitive types

* Use c++11 nullptr keyword and various indentation issues resolved

* ran petstore on new mustaches
2016-10-22 22:58:39 +08:00
wing328
a839a6803f Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-20 18:40:19 +08:00
Ragnis Armus
c73e499c5d [Qt5 C++] Actually use the model name prefix in the Qt5 generator (#3981)
* Actually use the model name prefix

* Update the petstore sample
2016-10-19 23:08:14 +08:00
wing328
bbb0cdc8c3 update gitignore to include PetStore.pro.user 2016-10-19 16:43:11 +08:00
wing328
7f36dd7852 increase timeout value for qt5 petstore test 2016-10-19 16:34:26 +08:00
Ragnis Armus
dee2dd8d36 [Qt5 C++] Replace illegal characters in param names for Qt5 generator (#3978)
* Fix illegal characters in param names

* Re-generate the petstore sample
2016-10-15 18:23:36 +08:00
wing328
8eff9188fb Merge pull request #3153 from wing328/qtcpp_license
[Qt5 C++] Add apache2 license to qt5cpp files
2016-06-17 12:20:09 +08:00
wing328
6bdee2adb5 add apache2 license to qt5cpp 2016-06-17 00:04:05 +08:00
philicious
691ef88333 updated SWGHelpers in tests with output from 1b79734 2016-06-14 00:15:39 +02:00
philicious
9825dfc735 fixed Qt5 api-body template bug with form params 2016-06-14 00:13:12 +02:00
philicious
511971cf67 fixed wrong function parameter type in PetApiTest.cpp 2016-06-13 23:54:27 +02:00
philicious
6f85deeecd added missing source/header for SWGApiResponse in Makefile 2016-06-13 23:53:01 +02:00
philicious
8fab73fff6 added missing systemIncludes for QMap, QDateTime, QDate 2016-06-13 23:52:13 +02:00
wing328
8e85476cbb add new fles 2016-04-16 18:19:23 +08:00
wing328
e62ba9b35d update qt5cpp and tizen sample 2016-04-16 18:16:42 +08:00
wing328
d5aa285926 fix file support in form parameter (qt5cpp) 2016-01-30 15:31:08 +08:00
wing328
a866c7fef4 Merge pull request #1682 from wing328/cpp_improve_test
[Qt5] improve Qt5 test cases
2015-12-09 11:19:34 +08:00
wing328
bf63be3a63 improve cpp test case 2015-12-08 17:23:54 +08:00
Lars Mikkelsen
0cef7116e8 Replace #import with #include in the Qt5 generator
The SWGHelpers.cpp file uses non-standard #import statements. This
causes the following error when built using Visual Studio 2013:

SWGHelpers.cpp(4): fatal error C1083: Cannot open type library file:
'c:\qt\qt5.5.1\5.5\msvc2013_64\include\qtcore\qdebug': Error loading
type library/DLL.
2015-12-07 23:30:37 -05:00
Tony Tam
e3151c57a0 rebuilt 2015-10-20 10:29:48 -07:00
fehguy
3d2f09a693 updated versions 2015-06-09 00:25:09 -07:00
Tony Tam
64ea3f8177 rebuilt 2015-06-07 20:50:35 -07:00
Tony Tam
087c28dae4 rebuilt client 2015-05-23 09:04:46 -07:00
Tony Tam
11dd7784f8 rebuilt 2015-05-20 22:20:51 -07:00
Tony Tam
6ec7cf5a9d updated request process 2015-05-16 01:09:01 -07:00
Tony Tam
f4cbd88e2c fixed ordering 2015-05-16 00:45:42 -07:00
Tony Tam
b4674d6fc5 template updates, tests 2015-05-15 11:27:03 -07:00
Tony Tam
622d883344 fixed input type 2015-05-12 06:57:37 -04:00
Tony Tam
8519480f2c removed some cruft 2015-05-12 06:50:45 -04:00
Tony Tam
037a00720f added qt5 samples, script 2015-05-12 06:04:10 -04:00