wing328
98684d872c
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-06-01 07:10:03 +08:00
Jonathan Leitschuh
d6f2424152
Fix spring generated controller annotations only generating for first return type ( #5399 )
...
Fixes the spring java code generator so that the ApiResponse fields are populated correctly
on the controller.
Related to #4693
2017-05-31 17:27:32 +08:00
wing328
e1e5ac4d37
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-05-17 22:00:06 +08:00
wing328
0a67696de8
Merge branch 'empty_classes' of https://github.com/bbdouglas/swagger-codegen into bbdouglas-empty_classes
2017-05-16 17:51:42 +08:00
Elizabeth Thomas
41cfcc6f23
Marking Accept as an optional header ( #5622 )
...
* Making Accept Header as not required by default
* Adding the auto-generated spring mvc petstore sample controllers
2017-05-16 16:30:11 +08:00
wing328
b8715fc4a5
add back example support to java spring (breaking changes) ( #5606 )
2017-05-10 23:31:25 +08:00
wing328
45ff39c237
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-05-10 18:04:49 +08:00
wing328
9b68f02f83
[Java][Spring] Undo "Add examples defined in the spec to Spring MVC server generator " ( #5599 )
...
* remove unused pom.xml in go pestore
* remove example support in JavaSprin (undo changes)
2017-05-10 17:31:43 +08:00
wing328
2ac169c750
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-28 02:03:42 +08:00
wing328
2324e927bd
[Java][Spring] fix missing import for java.io.IOException ( #5501 )
...
* fix issue about import io exception for spring mvc
* fix spring-mvc-petstore-j8-async script, config
* update spring cloud client, restore petstore.yaml
2017-04-28 00:45:06 +08:00
wing328
7b57dd0c04
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-27 21:18:52 +08:00
wing328
3c9b495eb1
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-27 21:16:16 +08:00
wing328
58db6a5e14
Revert "Issue#5376- changes to include swagger version in generated api files ( #5449 )" ( #5489 )
...
This reverts commit 702f193f6191a8f6d0b59f2d34292c616e7bcc4d.
2017-04-26 17:53:36 +08:00
wing328
f4d78079de
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-25 23:34:45 +08:00
Elizabeth Thomas
702f193f61
Issue#5376- changes to include swagger version in generated api files ( #5449 )
...
* Elizabeth - changes to include swagger version in generated api files
* Filtering version.properties in swagger codegen module
* Removing resource filtering from swagger codegen cli module
* Merging master
2017-04-25 23:28:16 +08:00
Elizabeth Thomas
efb337dd92
Issue 5413 - Use ConstructorBased Injection for ObjectMapper ( #5430 )
...
* Converting to constructor based injection
* Correcting spelling mistake
* Adding the bean for ObjectMapper
* Adding files modified by running the petstore scripts
* Adding final qualifier to objectMapper variable in apiController mustache
2017-04-25 23:11:18 +08:00
wing328
3ef7694b9f
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-25 21:39:17 +08:00
wing328
4067986e1c
update spring mvc samples
2017-04-24 00:06:42 +08:00
wing328
f7cbb2c0e6
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-23 15:26:15 +08:00
wing328
813949dd00
add lamda to clean up examples, fix spring tempalate format
2017-04-18 18:14:00 +08: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
34a99d6dba
update spring petstore samples
2017-04-17 23:32:03 +08:00
wing328
c7ccb1a9a9
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-17 23:05:46 +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
wing328
0682e41d6d
update spring petstore sample
2017-04-13 17:44:38 +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
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
wing328
956e7b4cb5
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-04-04 23:04:25 +08:00
Paŭlo Ebermann
f0b0226e46
[Java][JaxRS][Spring-MVC] Update samples for jaxrs with Jersey 1/2 and for spring-mvc ( #5212 )
...
* Update samples for Spring-MVC.
* Update samples for Spring-MVC-Jav8-async.
* Update samples jaxrs/jersey1.
* Update samples jaxrs/jersey2.
* Update samples spring-mvc
* Update samples spring-mvc-j8-async
2017-04-04 21:41:22 +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
Paul Ebermann
aba5abd15e
Update samples again after swagger-parser bump.
2017-03-14 12:54:11 +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
pablograna
fb75996527
Make java spring controller constructor public. ( #4972 )
...
* Make java spring controller constructor public.
This lets users manually create the controller and inject the delegate in the
spring configuration file, instead of letting spring scan for controllers and
autowire the delegate.
* Ran spring-all-pestore.sh.
2017-03-09 23:11:44 +08:00
Paŭlo Ebermann
88c9b6062d
Fix for #1219 ( #4875 )
...
* Update spring samples with current code.
This is done so I can see my own changes better.
* Regenerate samples after 2.2.2.
* use baseName instead of paramName for spring annotations.
* update spring petstore samples to show the effects.
2017-03-03 16:35:12 +08:00
wing328
acd10318f7
Merge remote-tracking branch 'origin' into sync_master_230
2017-02-10 23:31:36 +08:00
wing328
beadd6d740
update java server stub samples with new uuid mapping
2017-02-08 16:39:02 +08:00
eamon316
23aee52bcd
Feature/4606 ( #4607 )
...
* Issue #4606 (Spring) SubClass annotations are missing from the base class
* Issue #4606 (Spring) SubClass annotations are missing from the base class
* Commit updated samples from ./bin/spring-all-pestore.sh
2017-02-03 22:30:32 +08:00
jfiala
8952815b5f
[Spring] Add beanvalidation annotations ( #4600 )
...
* update generated sample for spring boot #4091
* add beanvalidation annotations to spring #4091
* add tests for spring #4091
* cleanup spring-cloud (client lib) #4091
* update client sample spring-cloud #4091
* replace tabs
* add beanvalidation annotations to spring #4091
* add tests for spring #4091
* cleanup spring-cloud (client lib) #4091
* update client sample spring-cloud #4091
* replace tabs
* update spring-cloud sample
2017-01-26 23:45:36 +08:00
Jonathan Leitschuh
78f38f1a1f
Add support for read-only values in spring model ( #4629 )
2017-01-25 16:34:55 +08:00
Jonathan Leitschuh
36c3fa05e0
Allows for generation of spring controller code using the delegate pattern ( #4439 )
...
* Allows for generation of spring conroller code using the decorator pattern
* Change Decorator to Delegate in spring codegen
2017-01-19 17:58:39 +08:00
Kevin Locke
df0c54d043
Support the empty string as an enumeration value ( #4450 )
...
When a string enumeration has the empty string as one of its available
values, the generated code for many languages is invalid because the
empty string can not be used as an identifier. As with numbers and
symbols, provide a mapping to an English name which can be used as a
replacement. In this case, "empty" for the empty string/empty value.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2017-01-06 19:30:47 +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
cde24f1113
Merge pull request #4189 from cbornet/spring_cloud_operations
...
[Spring] Use tag operation grouping for spring-cloud
2016-11-18 16:51:36 +08:00
wing328
88227e08e3
Remove Apache license from server stub generators ( #4200 )
...
* remove php apache license
* remove license in sample code, update nodejs to use unlicnese
* remove license from jaxrs generator
* remove license from server generator
* update pom.xml for jaxrs resteasy joda server
2016-11-17 00:37:21 +08:00
cbornet
4a196a9187
[Spring] Use tag operation grouping for spring-cloud
...
Instead of basepath based grouping that is used by Spring boot/MVC
2016-11-15 18:46:48 +01:00
wing328
636623d0e9
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-11-04 19:17:35 +08:00