loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Use https URL to download dependencies (#2248)

Browse Source 
* fix groovy default value, use https to download dep

* update groovy build gradle file
This commit is contained in:
William Cheng 2019-02-27 23:26:53 +08:00 committed by GitHub
parent 92757581d6
commit 54d9c19c77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 64 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/kotlin-server-petstore.sh
View File

@ -26,7 +26,7 @@ then
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 -DdebugSupportingFiles=true"
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -t modules/openapi-generator/src/main/resources/kotlin-server -g kotlin-server --library=ktor -o samples/server/petstore/kotlin-server/ktor -DhideGenerationTimestamp=true $@"
java ${JAVA_OPTS} -jar ${executable} ${ags}

17
modules/openapi-generator/src/main/resources/Groovy/build.gradle.mustache vendored
View File

@ -2,14 +2,13 @@ apply plugin: 'groovy'
apply plugin: 'idea'
apply plugin: 'eclipse'
def artifactory = 'buildserver.supportspace.com'
group = 'com.supportspace'
group = '{{groupId}}'
version = '{{artifactVersion}}'
archivesBaseName = 'openapi-gen-groovy'
version = '0.1'
buildscript {
repositories {
maven { url 'http://repo.jfrog.org/artifactory/gradle-plugins' }
maven { url 'https://repo.jfrog.org/artifactory/gradle-plugins' }
}
dependencies {
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.0.16')
@ -19,14 +18,12 @@ buildscript {
repositories {
mavenCentral()
mavenLocal()
mavenCentral(artifactUrls: ['http://maven.springframework.org/milestone'])
maven { url "http://$artifactory:8080/artifactory/repo" }
}
ext {
swagger_annotations_version = "1.5.21"
swagger_annotations_version = "1.5.22"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.2"
jackson_databind_version = "2.8.11.3"
}
dependencies {
@ -34,8 +31,8 @@ dependencies {
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_databind_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
}

2
modules/openapi-generator/src/main/resources/Groovy/model.mustache vendored
View File

@ -13,7 +13,7 @@ class {{classname}} {
{{#description}}
/* {{{description}}} */
{{/description}}
{{{dataType}}} {{name}} = {{{defaultValue}}}
{{{dataType}}} {{name}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
{{/vars}}
}

6
modules/openapi-generator/src/main/resources/finch/build.sbt
View File

@ -10,13 +10,13 @@ scalaVersion := "2.12.3"
resolvers += Resolver.sonatypeRepo("snapshots")
resolvers += "TM" at "http://maven.twttr.com"
resolvers += "TM" at "https://maven.twttr.com"
resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
resolvers += "Sonatype OSS Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/"
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
resolvers += "Sonatype OSS Releases" at "http://oss.sonatype.org/content/repositories/releases/"
resolvers += "Sonatype OSS Releases" at "https://oss.sonatype.org/content/repositories/releases/"
Defaults.itSettings

2
modules/openapi-generator/src/main/resources/kotlin-server/libraries/ktor/build.gradle.mustache vendored
View File

@ -57,7 +57,7 @@ shadowJar {
repositories {
mavenCentral()
maven { url "http://dl.bintray.com/kotlin/ktor" }
maven { url "https://dl.bintray.com/kotlin/ktor" }
maven { url "https://dl.bintray.com/kotlin/kotlinx" }
}

2
samples/client/petstore/groovy/.openapi-generator/VERSION
View File

@ -1 +1 @@
3.0.0-SNAPSHOT
4.0.0-SNAPSHOT

13
samples/client/petstore/groovy/build.gradle
View File

@ -2,14 +2,13 @@ apply plugin: 'groovy'
apply plugin: 'idea'
apply plugin: 'eclipse'
def artifactory = 'buildserver.supportspace.com'
group = 'com.supportspace'
group = 'org.openapitools'
version = '1.0.0'
archivesBaseName = 'openapi-gen-groovy'
version = '0.1'
buildscript {
repositories {
maven { url 'http://repo.jfrog.org/artifactory/gradle-plugins' }
maven { url 'https://repo.jfrog.org/artifactory/gradle-plugins' }
}
dependencies {
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.0.16')
@ -19,14 +18,12 @@ buildscript {
repositories {
mavenCentral()
mavenLocal()
mavenCentral(artifactUrls: ['http://maven.springframework.org/milestone'])
maven { url "http://$artifactory:8080/artifactory/repo" }
}
ext {
swagger_annotations_version = "1.5.21"
swagger_annotations_version = "1.5.22"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.2"
jackson_databind_version = "2.8.11.3"
}
dependencies {

12
samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/PetApi.groovy
View File

@ -15,7 +15,7 @@ class PetApi {
String basePath = "http://petstore.swagger.io/v2"
String versionPath = "/api/v1"
def addPet ( Pet pet, Closure onSuccess, Closure onFailure) {
def addPet ( Pet body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/pet"
@ -24,8 +24,8 @@ class PetApi {
def headerParams = [:]
// verify required params are set
if (pet == null) {
throw new RuntimeException("missing required params pet")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support
@ -128,7 +128,7 @@ class PetApi {
}
def updatePet ( Pet pet, Closure onSuccess, Closure onFailure) {
def updatePet ( Pet body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/pet"
@ -137,8 +137,8 @@ class PetApi {
def headerParams = [:]
// verify required params are set
if (pet == null) {
throw new RuntimeException("missing required params pet")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support

6
samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/StoreApi.groovy
View File

@ -72,7 +72,7 @@ class StoreApi {
}
def placeOrder ( Order order, Closure onSuccess, Closure onFailure) {
def placeOrder ( Order body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/store/order"
@ -81,8 +81,8 @@ class StoreApi {
def headerParams = [:]
// verify required params are set
if (order == null) {
throw new RuntimeException("missing required params order")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support

24
samples/client/petstore/groovy/src/main/groovy/org/openapitools/api/UserApi.groovy
View File

@ -14,7 +14,7 @@ class UserApi {
String basePath = "http://petstore.swagger.io/v2"
String versionPath = "/api/v1"
def createUser ( User user, Closure onSuccess, Closure onFailure) {
def createUser ( User body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/user"
@ -23,8 +23,8 @@ class UserApi {
def headerParams = [:]
// verify required params are set
if (user == null) {
throw new RuntimeException("missing required params user")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support
@ -35,7 +35,7 @@ class UserApi {
}
def createUsersWithArrayInput ( List<User> user, Closure onSuccess, Closure onFailure) {
def createUsersWithArrayInput ( List<User> body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/user/createWithArray"
@ -44,8 +44,8 @@ class UserApi {
def headerParams = [:]
// verify required params are set
if (user == null) {
throw new RuntimeException("missing required params user")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support
@ -56,7 +56,7 @@ class UserApi {
}
def createUsersWithListInput ( List<User> user, Closure onSuccess, Closure onFailure) {
def createUsersWithListInput ( List<User> body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/user/createWithList"
@ -65,8 +65,8 @@ class UserApi {
def headerParams = [:]
// verify required params are set
if (user == null) {
throw new RuntimeException("missing required params user")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support
@ -167,7 +167,7 @@ class UserApi {
}
def updateUser ( String username, User user, Closure onSuccess, Closure onFailure) {
def updateUser ( String username, User body, Closure onSuccess, Closure onFailure) {
// create path and map path parameters (TODO)
String resourcePath = "/user/{username}"
@ -181,8 +181,8 @@ class UserApi {
}
// verify required params are set
if (user == null) {
throw new RuntimeException("missing required params user")
if (body == null) {
throw new RuntimeException("missing required params body")
}
// TODO: form params, body param not yet support

4
samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Category.groovy
View File

@ -6,8 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
@Canonical
class Category {
Long id = null
Long id
String name = null
String name
}

6
samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/ModelApiResponse.groovy
View File

@ -6,10 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
@Canonical
class ModelApiResponse {
Integer code = null
Integer code
String type = null
String type
String message = null
String message
}

10
samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Order.groovy
View File

@ -6,16 +6,16 @@ import io.swagger.annotations.ApiModelProperty;
@Canonical
class Order {
Long id = null
Long id
Long petId = null
Long petId
Integer quantity = null
Integer quantity
Date shipDate = null
Date shipDate
/* Order Status */
String status = null
String status
Boolean complete = false

6
samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Pet.groovy
View File

@ -10,17 +10,17 @@ import org.openapitools.model.Tag;
@Canonical
class Pet {
Long id = null
Long id
Category category = null
String name = null
String name
List<String> photoUrls = new ArrayList<String>()
List<Tag> tags = new ArrayList<Tag>()
/* pet status in the store */
String status = null
String status
}

4
samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/Tag.groovy
View File

@ -6,8 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
@Canonical
class Tag {
Long id = null
Long id
String name = null
String name
}

16
samples/client/petstore/groovy/src/main/groovy/org/openapitools/model/User.groovy
View File

@ -6,21 +6,21 @@ import io.swagger.annotations.ApiModelProperty;
@Canonical
class User {
Long id = null
Long id
String username = null
String username
String firstName = null
String firstName
String lastName = null
String lastName
String email = null
String email
String password = null
String password
String phone = null
String phone
/* User Status */
Integer userStatus = null
Integer userStatus
}

2
samples/server/petstore/kotlin-server/ktor/build.gradle
View File

@ -57,7 +57,7 @@ shadowJar {
repositories {
mavenCentral()
maven { url "http://dl.bintray.com/kotlin/ktor" }
maven { url "https://dl.bintray.com/kotlin/ktor" }
maven { url "https://dl.bintray.com/kotlin/kotlinx" }
}