Skip to content

Kotlin generator migration/cleanup #7739

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.

Sign up for GitHub

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

Merged
HugoMario merged 18 commits into from
Apr 11, 2018
Merged

Kotlin generator migration/cleanup #7739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
86ee02b
Moving kotlin support code to swagger-codegen-generators
tcslater Feb 20, 2018
ee834db
Moving kotlin support code to swagger-codegen-generators
tcslater Feb 20, 2018
d520354
Revert "Moving kotlin support code to swagger-codegen-generators"
tcslater Feb 25, 2018
b82dfe3
Put back old class and mark as deprecated
tcslater Feb 25, 2018
fcb1b9b
Merge 3.0.0 branch updates
tcslater Feb 25, 2018
a90dad1
Remove kotlin classes from service registry
tcslater Feb 26, 2018
3992702
Revert "Moving kotlin support code to swagger-codegen-generators"
tcslater Feb 26, 2018
5d89b72
Merge branch '3.0.0' into kotlin
tcslater Feb 27, 2018
9ca8242
Remove template path from petstore script
tcslater Feb 27, 2018
56d9430
Merge branch '3.0.0' into kotlin
tcslater Feb 28, 2018
b33abfd
Merge 3.0.0
tcslater Mar 3, 2018
896c691
Uncomment java command for kotlin-client petstore scripts
tcslater Mar 5, 2018
9aa7e0b
Update for name change of kotlin-client generator
tcslater Mar 5, 2018
68a4e08
Merge branch '3.0.0' into kotlin
tcslater Mar 5, 2018
5efe922
Merge branch '3.0.0' into kotlin
tcslater Mar 20, 2018
ddedbf9
Merge branch '3.0.0' into kotlin
tcslater Mar 25, 2018
ce75e47
Merge branch '3.0.0' into kotlin
tcslater Mar 27, 2018
da5a7f3
Merge branch '3.0.0' of https://github.com/swagger-api/swagger-codege…
tcslater Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/kotlin-client-petstore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="generate -t modules/swagger-codegen/src/main/resources/kotlin-client -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l kotlin --artifact-id kotlin-petstore-client -o samples/client/petstore/kotlin $@"
ags="generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l kotlin-client --artifact-id kotlin-petstore-client -o samples/client/petstore/kotlin $@"
Copy link
Copy Markdown
Contributor

@jimschubert jimschubert Mar 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's weird that "language" is "kotlin-client".


# java ${JAVA_OPTS} -jar ${executable} ${ags}
java ${JAVA_OPTS} -jar ${executable} ${ags}
4 changes: 2 additions & 2 deletions bin/windows/kotlin-client-petstore.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ If Not Exist %executable% (
)

REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
set ags=generate --artifact-id "kotlin-petstore-client" -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l kotlin -o samples\client\petstore\kotlin
set ags=generate --artifact-id "kotlin-petstore-client" -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l kotlin-client -o samples\client\petstore\kotlin

REM java %JAVA_OPTS% -jar %executable% %ags%
java %JAVA_OPTS% -jar %executable% %ags%
5 changes: 5 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/KotlinClientCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
import java.util.HashSet;
import java.util.Map;

/**
* new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-generators
* @deprecated use <code>io.swagger.codegen.languages.kotlin.KotlinClientCodegen</code> instead.
*/
@Deprecated
public class KotlinClientCodegen extends DefaultCodegen implements CodegenConfig {
static Logger LOGGER = LoggerFactory.getLogger(KotlinClientCodegen.class);

Expand Down