-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump io.swagger:swagger-codegen from 2.3.1 to 2.4.12 #91
Merged
macisamuele
merged 5 commits into
Yelp:master
from
macisamuele:maci-bump-swagger-codegen-2
Feb 4, 2020
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bc482ed
Bump io.swagger:swagger-codegen from 2.3.1 to 2.4.12
macisamuele b69d5fd
Remove custom InlineModelResolver
macisamuele 2810508
Ensure that all the models have a title defined. The title will be de…
macisamuele 52ca9f7
Enhance junit-tests specs to verify the model naming
macisamuele 26cfafe
Regenerate junit-tests
macisamuele File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
495 changes: 0 additions & 495 deletions
495
plugin/src/main/java/com/yelp/codegen/utils/InlineModelResolver.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
.../junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/apis/ModelNameCheckApi.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/** | ||
* NOTE: This class is auto generated by the Swagger Gradle Codegen for the following API: JUnit Tests | ||
* | ||
* More info on this tool is available on https://github.com/Yelp/swagger-gradle-codegen | ||
*/ | ||
|
||
package com.yelp.codegen.generatecodesamples.apis | ||
|
||
import com.yelp.codegen.generatecodesamples.models.InlineResponse200 | ||
import com.yelp.codegen.generatecodesamples.models.ModelWithOnlyTitle | ||
import com.yelp.codegen.generatecodesamples.models.ModelWithOnlyXModel | ||
import com.yelp.codegen.generatecodesamples.models.ModelWithXModelAndTitle | ||
import io.reactivex.Single | ||
import retrofit2.http.GET | ||
import retrofit2.http.Headers | ||
|
||
@JvmSuppressWildcards | ||
interface ModelNameCheckApi { | ||
/** | ||
* The endpoint is owned by junittests service owner | ||
*/ | ||
@Headers( | ||
"X-Operation-ID: getInlinedModelWithNoNames" | ||
) | ||
@GET("/model_name/no_x-model_or_title") | ||
fun getInlinedModelWithNoNames(): Single<InlineResponse200> | ||
|
||
/** | ||
* The endpoint is owned by junittests service owner | ||
*/ | ||
@Headers( | ||
"X-Operation-ID: getInlinedModelWithTitleOnly" | ||
) | ||
@GET("/model_name/title_only") | ||
fun getInlinedModelWithTitleOnly(): Single<ModelWithOnlyTitle> | ||
|
||
/** | ||
* The endpoint is owned by junittests service owner | ||
*/ | ||
@Headers( | ||
"X-Operation-ID: getInlinedModelWithXModelAndTitle" | ||
) | ||
@GET("/model_name/x-model_and_title") | ||
fun getInlinedModelWithXModelAndTitle(): Single<ModelWithXModelAndTitle> | ||
|
||
/** | ||
* The endpoint is owned by junittests service owner | ||
*/ | ||
@Headers( | ||
"X-Operation-ID: getInlinedModelWithXModelOnly" | ||
) | ||
@GET("/model_name/x-model_only") | ||
fun getInlinedModelWithXModelOnly(): Single<ModelWithOnlyXModel> | ||
} |
29 changes: 29 additions & 0 deletions
29
...unit-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/InlineResponse200.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/** | ||
* NOTE: This class is auto generated by the Swagger Gradle Codegen for the following API: JUnit Tests | ||
* | ||
* More info on this tool is available on https://github.com/Yelp/swagger-gradle-codegen | ||
*/ | ||
|
||
package com.yelp.codegen.generatecodesamples.models | ||
|
||
import com.squareup.moshi.Json | ||
import com.squareup.moshi.JsonClass | ||
|
||
/** | ||
* | ||
* @property noXmodelNoTitle | ||
*/ | ||
@JsonClass(generateAdapter = true) | ||
data class InlineResponse200( | ||
@Json(name = "no_xmodel_no_title") @field:Json(name = "no_xmodel_no_title") var noXmodelNoTitle: InlineResponse200.NoXmodelNoTitleEnum? = null | ||
) { | ||
/** | ||
* | ||
* Values: VAL1, VAL2 | ||
*/ | ||
@JsonClass(generateAdapter = false) | ||
enum class NoXmodelNoTitleEnum(val value: String) { | ||
@Json(name = "val1") VAL1("val1"), | ||
@Json(name = "val2") VAL2("val2") | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...nit-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/ModelWithOnlyTitle.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/** | ||
* NOTE: This class is auto generated by the Swagger Gradle Codegen for the following API: JUnit Tests | ||
* | ||
* More info on this tool is available on https://github.com/Yelp/swagger-gradle-codegen | ||
*/ | ||
|
||
package com.yelp.codegen.generatecodesamples.models | ||
|
||
import com.squareup.moshi.Json | ||
import com.squareup.moshi.JsonClass | ||
|
||
/** | ||
* | ||
* @property titleOnly | ||
*/ | ||
@JsonClass(generateAdapter = true) | ||
data class ModelWithOnlyTitle( | ||
@Json(name = "title_only") @field:Json(name = "title_only") var titleOnly: ModelWithOnlyTitle.TitleOnlyEnum? = null | ||
) { | ||
/** | ||
* | ||
* Values: VAL1, VAL2 | ||
*/ | ||
@JsonClass(generateAdapter = false) | ||
enum class TitleOnlyEnum(val value: String) { | ||
@Json(name = "val1") VAL1("val1"), | ||
@Json(name = "val2") VAL2("val2") | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...it-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/ModelWithOnlyXModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/** | ||
* NOTE: This class is auto generated by the Swagger Gradle Codegen for the following API: JUnit Tests | ||
* | ||
* More info on this tool is available on https://github.com/Yelp/swagger-gradle-codegen | ||
*/ | ||
|
||
package com.yelp.codegen.generatecodesamples.models | ||
|
||
import com.squareup.moshi.Json | ||
import com.squareup.moshi.JsonClass | ||
|
||
/** | ||
* | ||
* @property xmodelOnly | ||
*/ | ||
@JsonClass(generateAdapter = true) | ||
data class ModelWithOnlyXModel( | ||
@Json(name = "xmodel_only") @field:Json(name = "xmodel_only") var xmodelOnly: ModelWithOnlyXModel.XmodelOnlyEnum? = null | ||
) { | ||
/** | ||
* | ||
* Values: VAL1, VAL2 | ||
*/ | ||
@JsonClass(generateAdapter = false) | ||
enum class XmodelOnlyEnum(val value: String) { | ||
@Json(name = "val1") VAL1("val1"), | ||
@Json(name = "val2") VAL2("val2") | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...ests/src/main/java/com/yelp/codegen/generatecodesamples/models/ModelWithXModelAndTitle.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/** | ||
* NOTE: This class is auto generated by the Swagger Gradle Codegen for the following API: JUnit Tests | ||
* | ||
* More info on this tool is available on https://github.com/Yelp/swagger-gradle-codegen | ||
*/ | ||
|
||
package com.yelp.codegen.generatecodesamples.models | ||
|
||
import com.squareup.moshi.Json | ||
import com.squareup.moshi.JsonClass | ||
|
||
/** | ||
* | ||
* @property xmodelAndTitle | ||
*/ | ||
@JsonClass(generateAdapter = true) | ||
data class ModelWithXModelAndTitle( | ||
@Json(name = "xmodel_and_title") @field:Json(name = "xmodel_and_title") var xmodelAndTitle: ModelWithXModelAndTitle.XmodelAndTitleEnum? = null | ||
) { | ||
/** | ||
* | ||
* Values: VAL1, VAL2 | ||
*/ | ||
@JsonClass(generateAdapter = false) | ||
enum class XmodelAndTitleEnum(val value: String) { | ||
@Json(name = "val1") VAL1("val1"), | ||
@Json(name = "val2") VAL2("val2") | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:O