wing328
acd10318f7
Merge remote-tracking branch 'origin' into sync_master_230
2017-02-10 23:31:36 +08:00
eblis
869374125f
#4625 - Check if configOptions are set before trying to get the source folder, otherwise assume null/empty. ( #4626 )
...
(reworked pr)
2017-01-27 17:04:32 +08:00
wing328
029728d851
[maven-plugin] allow for ignore file override ( #4597 )
...
* [maven-plugin] allow for ignore file override
The .swagger-codegen-ignore file is beneficial for existing source
directories to provide pattern-based exclusion rules for existing source
to be ignored by swagger codegen. Until now, there's been no utility
other than skipOverwrite to modify the initial generation of code
(either via CLI or maven plugin).
This commit adds support for an ignoreFileOverride option to both the
CLI and the maven plugin.
Example CLI usage:
```
java -jar swagger-codegen.jar generate \
-i swagger.json -l csharp \
-o target --ignore-file-override /path/to/ignore-file
```
Example Maven Plugin configuration:
```
<build>
<plugins>
<plugin>
<groupId>io.swagger</groupId>
<artifactId>swagger-codegen-maven-plugin</artifactId>
<version>2.2.2-SNAPSHOT</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/resources/swagger.yaml</inputSpec>
<language>csharp</language>
<invokerPackage>io.swagger</invokerPackage>
<modelPackage>io.swagger.models</modelPackage>
<apiPackage>io.swagger.apis</apiPackage>
<ignoreFileOverride>/Users/jim/projects/swagger-codegen/.sample-ignore</ignoreFileOverride>
<configOptions>
</configOptions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
```
* [maven-plugin] update new javadocs
* fix bad merge due to missing }
2017-01-19 23:17:25 +08:00
Dan Mikita
0a559f0dd2
Add support for modifier within the Jaxb XMLElement annotation ( #4433 )
...
* fixes #4432 Adding support for the modifier within the Jaxb XMLElement annotation. Updated README with JaxbAnnotations configuration option.
* #4432 Running the Petstore files
2017-01-17 15:26:30 +08:00
Alex Nolasco
26ead9b58f
Issue 4416 (Assist escapeReservedWord with custom mappings) ( #4480 )
...
* Preliminary implementation for issue-4416
* Updated README.md with reserved-words-mappings parameter.
2017-01-09 18:22:25 +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
Tadhg Pearson
79a71fd697
Update docs for Java code generation ( #4303 )
...
* Updated documentation to support Java code generation
* Tabs to spaces in example pom
2016-12-05 17:34:37 +08:00
Nick Maynard
4c05d5f098
Allow Java source formatting mvn formatter:format ( #4214 )
...
Uses Eclipse formatting tools with a configuration matching Google's style guide (plus our customisations).
2016-11-23 15:07:25 +08:00
wing328
43af07a2d4
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-11-16 16:44:39 +08:00
mbohlool
355e694fb2
Add gitUseID and gitRepoID flags to maven plugin
2016-11-15 17:35:13 -08:00
wing328
255bc02b83
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-11-09 16:37:11 +08:00
Stephan Wienczny
9436ba106c
Default added sourceFolder to src/main/java
...
Fallback to "src/main/java" for added source folder instead of a NullpointerException when no source folder ist configured in the pom
2016-11-04 15:35:48 +01:00
wing328
c7efb7000c
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-10-19 15:45:15 +08:00
wing328
1e57ba96d7
Correct source folder for generated files
2016-10-17 00:48:14 +08:00
wing328
766b04a2bd
Merge remote-tracking branch 'origin/master' into 2.3.0
2016-09-12 23:30:15 +08:00
Brent Ryan
95d63a6f1f
Bump version of pom to 2.3.0-SNAPSHOT for the 2.3.x release
2016-09-07 09:22:56 -04:00
Ville Skyttä
b4c139f19b
Spelling fixes
2016-08-27 02:34:33 +03:00
wing328
d7d351682f
Merge pull request #3610 from michalyao/master
...
update to version 2.2.2
2016-08-18 10:17:35 +08:00
Yao Yao
52125c33ad
update to version 2.2.2
2016-08-18 09:10:16 +08:00
Yao Yao
262dc14143
update to version 2.2.2
2016-08-17 15:16:56 +08:00
Tony Tam
c4f3cb1d9e
updated dev versions
2016-08-07 23:03:44 +02:00
Tony Tam
c147cfde1b
updated release versions
2016-08-07 11:49:01 +02:00
Tony Tam
39cb6a24db
updated dev versions
2016-07-17 15:43:30 -07:00
Tony Tam
c49db091ef
updated versions for release
2016-07-15 13:45:22 -07:00
christian
8533ca43b4
#3285 replaced setModelNamePrefix by setModelNameSuffix
2016-07-09 23:50:23 +02:00
christian
0ada53435c
#3284 : Made modelNamePrefix and -Suffix available through maven
2016-07-04 19:51:38 +02:00
wing328
af0c8b5ed0
Merge pull request #3005 from pablograna/remove-unnecessary-call-to-parser
...
Remove unnecessary 2nd call to SwaggerParser.
2016-05-31 14:10:20 +08:00
Pablo Gra\~na
50a346ca91
Remove unnecessary 2nd call to SwaggerParser.
...
Both CodeGenMojo and CodegenConfigurator where parsing the swagger input.
The result in CodeGenMojo was discarded. I simply removed the line in
CodeGenMojo.
2016-05-30 18:56:15 -03:00
wing328
31aee5b3a7
Merge pull request #2950 from wing328/update_pom_220
...
Update pom.xml to use 2.2.0-SNAPSHOT
2016-05-25 21:10:43 +08:00
Shaun Reich
06dd7c4794
add custom generator example to readme
...
fixes #2923
2016-05-24 14:44:21 -04:00
wing328
dbc3e418a9
udpate pom for other sub modules
2016-05-24 23:27:11 +08:00
Tony Tam
1fe2d3a165
release prepare
2016-04-06 14:07:52 -07:00
Jim Schubert
702d019bf8
[maven plugin] Use configurator for maven plugin
...
see swagger-api/swagger-codegen#2104
2016-02-17 22:33:39 -05:00
evigeant
bff0e2ad19
Fixed indentation to use spaces instead of tabs
2016-02-13 11:15:04 -05:00
evigeant
6db358dd39
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
2016-01-28 09:18:24 -05:00
Tony Tam
3ddccb5e5c
fix for #1976 , added missing types
2016-01-25 21:34:28 -08:00
evigeant
f13b4deb2e
Added warnings when the additionalProperties are not defined in the
...
cliOptions of a language.
2016-01-25 21:22:18 -05:00
evigeant
68c6954615
Fixed indentation
2016-01-25 13:53:31 -05:00
evigeant
6b59dd0899
Allow mave-codegen-plugin to set additionalProperties even if they are
...
not declared in the cliOptions.
2016-01-25 13:51:42 -05:00
Maelig Nantel
370a8d136f
fixes
2016-01-18 11:35:57 +01: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
Tony Tam
7c3406804d
updated versions
2016-01-07 20:43:49 -08:00
Tony Tam
d4d4c43032
updated versions
2016-01-06 09:47:32 -08:00
Tony Tam
380d8c1d15
added config help, example for https://github.com/swagger-api/swagger-codegen/pull/1784#issuecomment-168599569
2016-01-05 05:02:05 -08:00
Ron
9a54371ca9
Swagger Spec -> OpenAPI Spec
2015-12-30 14:52:15 -08:00
Tony Tam
b46e3ad400
updated for #1749
2015-12-21 22:16:11 -08:00
Tony Tam
6b7ceab081
updated to dev version
2015-10-25 20:59:52 -07:00
Tony Tam
dd3b253e15
updated versions
2015-10-25 19:31:36 -07:00
Tony Tam
91afec43a6
fixed NPE on empty props
2015-10-22 15:43:02 -07:00
Tony Tam
9f842a1295
added environment variable support
2015-10-22 14:34:52 -07:00