Updated versions for 2.2.3 release and other minor enhancements (#6070)

* update pom to prepare 2.2.3 release * add header support to qt5, update samples * update version in java help * update to xcode 9 * rollback to xcode8.2
2025-07-03 06:00:52 +00:00 · 2017-07-16 01:03:40 +08:00 · 2017-07-16 01:03:40 +08:00 · 34e94fbed0
commit 34e94fbed0
parent ff04f532bb
16 changed files with 113 additions and 76 deletions
--- a/.travis.objc_swift_test.yml
+++ b/.travis.objc_swift_test.yml
@ -1,57 +0,0 @@
-sudo: required
-language: objective-c 
-osx_image: xcode7.3 
-
-cache:
-  directories:
-  - $HOME/.m2
-  - $HOME/.gem
-  - $HOME/.rvm
-  - $HOME/.cocoapods
-  - swagger-api/swagger-codegen/samples/client/petstore/objc/default/SwaggerClientTests/Pods
-  - swagger-api/swagger-codegen/samples/client/petstore/objc/core-data/SwaggerClientTests/Pods
-  - swagger-api/swagger-codegen/samples/client/petstore/swift/default/SwaggerClientTests/Pods
-  - swagger-api/swagger-codegen/samples/client/petstore/swift/promisekit/SwaggerClientTests/Pods
-
-services:
-  - docker
-
-addons:
-  hosts:
-    - petstore.swagger.io
-
-before_install:
-   - export SW=`pwd`
-   # show host table to confirm petstore.swagger.io is mapped to localhost
-   - cat /private/etc/hosts
-   #- rvm install 2.2.2 > /dev/null 2>&1
-   - rvm use 2.2.4
-   - gem environment 
-   - gem install cocoapods -v 1.0.1 -N --no-ri --no-rdoc
-   - gem install xcpretty -N --no-ri --no-rdoc
-   - pod --version
-   - pod setup --silent > /dev/null
-   # xctool already pre-installed
-   #- brew install xctool
-   - git clone https://github.com/wing328/swagger-samples
-   - cd swagger-samples/java/java-jersey-jaxrs && sudo mvn -q jetty:run &
-
-install:
-
-script:
-   # test default objc client
-   - cd $SW/samples/client/petstore/objc/default/SwaggerClientTests && pod install && xctool -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination platform='iOS Simulator',OS=8.4,name='iPhone 6' test -test-sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
-   # test objc client with coredata
-   - cd $SW/samples/client/petstore/objc/core-data/SwaggerClientTests && pod install && xctool -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient-Example" -destination platform='iOS Simulator',OS=8.4,name='iPhone 6' test -test-sdk iphonesimulator CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
-   - set -o pipefail
-   # test swift client with promisekit
-   - cd $SW/samples/client/petstore/swift/promisekit/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
-   # test default swift client
-   - cd $SW/samples/client/petstore/swift/default/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
-   # test swift3 client with promisekit
-   - cd $SW/samples/client/petstore/swift3/promisekit/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
-   # test default swift3 client
-   - cd $SW/samples/client/petstore/swift3/default/SwaggerClientTests && pod install && xcodebuild clean test -workspace "SwaggerClient.xcworkspace" -scheme "SwaggerClient" -sdk iphonesimulator GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
-
-env:
-  - DOCKER_IMAGE_NAME=swaggerapi/swagger-generator
--- a/.travis.yml
+++ b/.travis.yml
@ -36,7 +36,7 @@ before_install:
  - export SW=`pwd`
  - rvm list
  - rvm use 2.2.5
-  - gem environment 
+  - gem environment
  - gem install bundler -N --no-ri --no-rdoc
  - gem install cocoapods -v 1.2.1 -N --no-ri --no-rdoc
  - gem install xcpretty -N --no-ri --no-rdoc
@ -108,4 +108,3 @@ after_success:
      mvn clean deploy --settings .travis/settings.xml;
      echo "Finished mvn clean deploy";
    fi;
-
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>io.swagger</groupId>
        <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.3</version>
        <relativePath>../..</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/swagger-codegen-maven-plugin/pom.xml
+++ b/modules/swagger-codegen-maven-plugin/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>io.swagger</groupId>
        <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.3</version>
        <relativePath>../..</relativePath>
    </parent>
    <artifactId>swagger-codegen-maven-plugin</artifactId>
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>io.swagger</groupId>
        <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.3</version>
        <relativePath>../..</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
@ -62,14 +62,14 @@ public class JavaClientCodegen extends AbstractJavaCodegen
        cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
        cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));

-        supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.1. JSON processing: Jackson 2.7.0. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
-        supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.7");
-        supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.22.2. JSON processing: Jackson 2.7.0");
-        supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.6.2. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
+        supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.8.9. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
+        supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("okhttp-gson", "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.8.1. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.");
        supportedLibraries.put(RETROFIT_1, "HTTP client: OkHttp 2.7.5. JSON processing: Gson 2.3.1 (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.");
-        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.2.0. JSON processing: Gson 2.6.1 (Retrofit 2.0.2). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
-        supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.7-RELEASE. JSON processing: Jackson 2.8.8");
-        supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.0.19.Final. JSON processing: Jackson 2.7.0");
+        supportedLibraries.put(RETROFIT_2, "HTTP client: OkHttp 3.8.0. JSON processing: Gson 2.6.1 (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)");
+        supportedLibraries.put("resttemplate", "HTTP client: Spring RestTemplate 4.3.9-RELEASE. JSON processing: Jackson 2.8.9");
+        supportedLibraries.put("resteasy", "HTTP client: Resteasy client 3.1.3.Final. JSON processing: Jackson 2.8.9");

        CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
        libraryOption.setEnum(supportedLibraries);
--- a/modules/swagger-generator/pom.xml
+++ b/modules/swagger-generator/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>io.swagger</groupId>
        <artifactId>swagger-codegen-project</artifactId>
-        <version>2.2.3-SNAPSHOT</version>
+        <version>2.2.3</version>
        <relativePath>../..</relativePath>
    </parent>
    <artifactId>swagger-generator</artifactId>
--- a/pom.xml
+++ b/pom.xml
@ -9,7 +9,7 @@
    <artifactId>swagger-codegen-project</artifactId>
    <packaging>pom</packaging>
    <name>swagger-codegen-project</name>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.2.3</version>
    <url>https://github.com/swagger-api/swagger-codegen</url>
    <scm>
        <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
@ -22,6 +22,11 @@
            <name>Tony Tam</name>
            <email>fehguy@gmail.com</email>
        </developer>
+        <developer>
+            <id>wing328</id>
+            <name>William Cheng</name>
+            <email>wing328hk@gmail.com</email>
+        </developer>
    </developers>
    <issueManagement>
        <system>github</system>
@ -905,7 +910,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-parser-version>1.0.30</swagger-parser-version>
+        <swagger-parser-version>1.0.31</swagger-parser-version>
        <scala-version>2.11.1</scala-version>
        <felix-version>3.3.0</felix-version>
        <swagger-core-version>1.5.15</swagger-core-version>
--- a/pom.xml.circleci
+++ b/pom.xml.circleci
@ -9,7 +9,7 @@
    <artifactId>swagger-codegen-project</artifactId>
    <packaging>pom</packaging>
    <name>swagger-codegen-project</name>
-    <version>2.2.3-SNAPSHOT</version>
+    <version>2.2.3</version>
    <url>https://github.com/swagger-api/swagger-codegen</url>
    <scm>
        <connection>scm:git:git@github.com:swagger-api/swagger-codegen.git</connection>
@ -25,6 +25,11 @@
            <name>Tony Tam</name>
            <email>fehguy@gmail.com</email>
        </developer>
+        <developer>
+            <id>wing328</id>
+            <name>William Cheng</name>
+            <email>wing328hk@gmail.com</email>
+        </developer>
    </developers>
    <issueManagement>
        <system>github</system>
@ -911,7 +916,7 @@
        </repository>
    </repositories>
    <properties>
-        <swagger-parser-version>1.0.28</swagger-parser-version>
+        <swagger-parser-version>1.0.31</swagger-parser-version>
        <scala-version>2.11.1</scala-version>
        <felix-version>3.3.0</felix-version>
        <swagger-core-version>1.5.15</swagger-core-version>
--- a/samples/client/petstore/qt5cpp/.swagger-codegen/VERSION
+++ b/samples/client/petstore/qt5cpp/.swagger-codegen/VERSION
@ -1 +1 @@
-2.2.3-SNAPSHOT
+2.2.3
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
@ -44,6 +44,10 @@ SWGPetApi::addPet(SWGPet body) {
    


+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -86,7 +90,13 @@ SWGPetApi::deletePet(qint64 pet_id, QString* api_key) {



-    // TODO: add header support
+    if (api_key != nullptr) {
+        input.headers.insert("api_key", "api_key");
+    }
+
+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }

    connect(worker,
            &HttpRequestWorker::on_execution_finished,
@ -171,6 +181,10 @@ SWGPetApi::findPetsByStatus(QList<QString*>* status) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -268,6 +282,10 @@ SWGPetApi::findPetsByTags(QList<QString*>* tags) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -325,6 +343,10 @@ SWGPetApi::getPetById(qint64 pet_id) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -371,6 +393,10 @@ SWGPetApi::updatePet(SWGPet body) {
    


+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -420,6 +446,10 @@ SWGPetApi::updatePetWithForm(qint64 pet_id, QString* name, QString* status) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -469,6 +499,10 @@ SWGPetApi::uploadFile(qint64 pet_id, QString* additional_metadata, SWGHttpReques



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
@ -34,6 +34,7 @@ public:

    QString host;
    QString basePath;
+    QMap<QString, QString> defaultHeaders;

    void addPet(SWGPet body);
    void deletePet(qint64 pet_id, QString* api_key);
--- a/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGStoreApi.cpp
@ -44,6 +44,10 @@ SWGStoreApi::deleteOrder(QString* order_id) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -85,6 +89,10 @@ SWGStoreApi::getInventory() {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -140,6 +148,10 @@ SWGStoreApi::getOrderById(qint64 order_id) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -186,6 +198,10 @@ SWGStoreApi::placeOrder(SWGOrder body) {
    


+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
--- a/samples/client/petstore/qt5cpp/client/SWGStoreApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGStoreApi.h
@ -33,6 +33,7 @@ public:

    QString host;
    QString basePath;
+    QMap<QString, QString> defaultHeaders;

    void deleteOrder(QString* order_id);
    void getInventory();
--- a/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.cpp
@ -44,6 +44,10 @@ SWGUserApi::createUser(SWGUser body) {
    


+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -92,6 +96,10 @@ SWGUserApi::createUsersWithArrayInput(QList<SWGUser*>* body) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -140,6 +148,10 @@ SWGUserApi::createUsersWithListInput(QList<SWGUser*>* body) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -183,6 +195,10 @@ SWGUserApi::deleteUser(QString* username) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -226,6 +242,10 @@ SWGUserApi::getUserByName(QString* username) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -286,6 +306,10 @@ SWGUserApi::loginUser(QString* username, QString* password) {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -330,6 +354,10 @@ SWGUserApi::logoutUser() {



+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
@ -375,6 +403,10 @@ SWGUserApi::updateUser(QString* username, SWGUser body) {
    


+    foreach(QString key, this->defaultHeaders.keys()) {
+        input.headers.insert(key, this->defaultHeaders.value(key));
+    }
+
    connect(worker,
            &HttpRequestWorker::on_execution_finished,
            this,
--- a/samples/client/petstore/qt5cpp/client/SWGUserApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGUserApi.h
@ -33,6 +33,7 @@ public:

    QString host;
    QString basePath;
+    QMap<QString, QString> defaultHeaders;

    void createUser(SWGUser body);
    void createUsersWithArrayInput(QList<SWGUser*>* body);