wing328
9269dac6cf
Merge remote-tracking branch 'origin/master' into 2.3.0
2017-07-01 15:47:27 +08:00
Jordan Zimmerman
40369bb819
Add java8 option 2.3.0 ( #5955 )
...
* Closes #5863
The "dateLibrary" option for java, sadly, sets a mustache value "java8". This change updates this so that "java" in the mustache
libraries means what it should mean - use all java8 classes. In this case, there's no need for the third party Base64 library
as java8's JDK has this built in. In my view, the "dateLibrary" should be deprecated but that should be a separate PR.
* Closes #5954
built and ran tests/samples
2017-07-01 15:04:18 +08:00
wing328
882c3ecba5
update java petstore with new uuid mapping
2017-02-08 16:07:09 +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
lukoyanov
a13dee7167
[Java] Play! Framework 2.4 WS client support + retrofit2 ( #4270 )
...
* implemented core integration with play 2.4 ws
* added shell script to test on CI
* added shell script to composite file for all java generators
* added some comments
changed promise param to Response<T> to allow access to http status code and raw response if needed
* removed unnecessary whitespace changes
* added java7 compatibility, play ws deps to pom.xml
* added generated play24 client
* fixed imports
2016-12-14 17:32:49 +08:00
