Merge branch 'master' into gradle-plugin-release-management

* master: Add 'unblu inc.' to company list (OpenAPITools#246) put company list in alphabetical order (OpenAPITools#244) [jaxrs-spec] generate spec file (yaml) correctly (OpenAPITools#243) [C++] Adjust the names (script, sample folder, generator) to lang option (OpenAPITools#220) Add GMO Pepabo to company list (OpenAPITools#242) [Spring] Add apiFirst option (OpenAPITools#184) [cli] Write to stdout/stderr, allow redirection (OpenAPITools#207) [JAVA][Client] New object instead of null for empty POST request (OpenAPITools#98) Make yaml serialization deterministic (OpenAPITools#233) Add syntax highlighting to migration guide (OpenAPITools#237) Fix shippable badge (OpenAPITools#232) update company list (OpenAPITools#227) Fix OpenAPITools#210: [Ada] Update the code generator for required and optional parameters (OpenAPITools#211) Delete unused methods in DefaultCodegen (OpenAPITools#209) add note about maven plugins (OpenAPITools#216) add raiffeisen to company list (OpenAPITools#223) add a remark about homebrew installatio (OpenAPITools#217)
jimschubert · Jun 8, 2018 · afca77e · afca77e
2 parents a774dcb + 51437af
commit afca77e
Show file tree

Hide file tree

Showing 291 changed files with 8,076 additions and 2,072 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 Master (3.0.0): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
-[![Run Status](https://img.shields.io/shippable/5af6bf74e790f4070084a115.svg?label=Template%20Test)](https://app.shippable.com/github/OpenAPITools/openapi-generator/dashboard)
+[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
 
 </div>
@@ -47,10 +47,11 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
   - [Table of Contents](#table-of-contents)
   - [1 - Installation](#1---installation)
     - [1.1 - Compatibility](#11---compatibility)
-    - [1.2 - Download JAR](#12---download-jar)
-    - [1.3 - Build Projects](#13---build-projects)
-    - [1.4 - Homebrew](#14---homebrew)
-    - [1.5 - Docker](#15---docker)
+    - [1.2 - Artifacts on Maven Central](#12---artifacts-on-maven-central)
+    - [1.3 - Download JAR](#13---download-jar)
+    - [1.4 - Build Projects](#14---build-projects)
+    - [1.5 - Homebrew](#15---homebrew)
+    - [1.6 - Docker](#16---docker)
   - [2 - Getting Started](#2---getting-started)
   - [3 - Usage](#3---usage)
     - [3.1 - Customization](#31---customization)
@@ -78,8 +79,53 @@ OpenAPI Generator Version    | Release Date | OpenAPI Spec compatibility | Notes
 3.0.1 (current master, upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.0.1-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bug fixes release
 3.0.0 | 01.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | First release with breaking changes
 
+### [1.2 - Artifacts on Maven Central](#table-of-contents)
 
-### [1.2 - Download JAR](#table-of-contents)
+You can find our released artefacts on maven central:
+
+**Core:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+* [openapi-generator](https://mvnrepository.com/artifact/org.openapitools/openapi-generator)
+
+**Cli:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator-cli</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+* [openapi-generator-cli](https://mvnrepository.com/artifact/org.openapitools/openapi-generator-cli)
+
+**Maven plugin:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator-maven-plugin</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+* [openapi-generator-maven-plugin](https://mvnrepository.com/artifact/org.openapitools/openapi-generator-maven-plugin)
+* [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-maven-plugin/README.adoc)
+
+**Gradle plugin:**
+```xml
+<dependency>
+    <groupId>org.openapitools</groupId>
+    <artifactId>openapi-generator-gradle-plugin</artifactId>
+    <version>${openapi-generator-version}</version>
+</dependency>
+```
+* [openapi-generator-gradle-plugin](https://mvnrepository.com/artifact/org.openapitools/openapi-generator-gradle-plugin)
+* [Readme](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/README.adoc)
+
+### [1.3 - Download JAR](#table-of-contents)
 
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
@@ -103,7 +149,7 @@ export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
 export PATH=${JAVA_HOME}/bin:$PATH
 ```
 
-### [1.3 - Build Projects](#table-of-contents)
+### [1.4 - Build Projects](#table-of-contents)
 
 To build from source, you need the following installed and available in your `$PATH:`
 
@@ -121,16 +167,16 @@ If you don't have maven installed, you may directly use the included [maven wrap
 ./mvnw clean install
 ```
 
-### [1.4 - Homebrew](#table-of-contents)
+### [1.5 - Homebrew](#table-of-contents)
 
-To install, run `brew install openapi-generator`
+To install, run `brew install openapi-generator` (the new brew formula is pending https://github.com/Homebrew/homebrew-core/pull/28584)
 
 Here is an example usage to generate a Ruby client:
 ```sh
 openapi-generator generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g ruby -o /tmp/test/
 ```
 
-### [1.5 - Docker](#table-of-contents)
+### [1.6 - Docker](#table-of-contents)
 
 #### Public Pre-built Docker images
 
@@ -347,9 +393,14 @@ The OpenAPI Generator project is intended as a benefit for users of the Open API
 When code is generated from this project, it shall be considered **AS IS** and owned by the user of the software.  There are no warranties--expressed or implied--for generated code.  You can do what you wish with it, and once generated, the code is your responsibility and subject to the licensing terms that you deem appropriate.
 
 ## [4 - Companies/Projects using OpenAPI Generator](#table-of-contents)
-Here are some companies/projects using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
+Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
 
+- [Bithost GmbH](https://www.bithost.ch)
+- [GMO Pepabo](https://pepabo.com/en/)
+- [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
 - [REST United](https://restunited.com)
+- [unblu inc.](https://www.unblu.com/)
+
 
 ## [5 - Presentations/Videos/Tutorials/Books](#table-of-contents)
 

diff --git a/bin/qt5-petstore.sh → bin/cpp-qt5-petstore.sh b/bin/qt5-petstore.sh → bin/cpp-qt5-petstore.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/qt5cpp $@"
+ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/cpprest-petstore.sh → bin/cpp-restsdk-petstore.sh b/bin/cpprest-petstore.sh → bin/cpp-restsdk-petstore.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-restsdk -o samples/client/petstore/cpprest $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpprest -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-restsdk -o samples/client/petstore/cpp-restsdk $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/tizen-petstore.sh → bin/cpp-tizen-petstore.sh b/bin/tizen-petstore.sh → bin/cpp-tizen-petstore.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/tizen $@"
+ags="generate -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/ensure-up-to-date b/bin/ensure-up-to-date
@@ -29,8 +29,11 @@ sleep 5
 if [ -n "$(git status --porcelain)" ]; then
     echo "UNCOMMITTED CHANGES ERROR"
     echo "There are uncommitted changes in working tree after execution of 'bin/ensure-up-to-date'"
+    echo "Perform git diff"
+    git --no-pager diff
+    echo "Perform git status"
     git status
-    echo "Please run 'bin/ensure-up-to-date' locally and commit changes"
+    echo "Please run 'bin/ensure-up-to-date' locally and commit changes (UNCOMMITTED CHANGES ERROR)"
     exit 1
 else
     echo "Git working tree is clean"

diff --git a/bin/openapi3/qt5-petstore.sh → bin/openapi3/cpp-qt5-petstore.sh b/bin/openapi3/qt5-petstore.sh → bin/openapi3/cpp-qt5-petstore.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/qt5cpp $@"
+ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5 -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/openapi3/tizen-petstore.sh → bin/openapi3/cpp-tizen-petstore.sh b/bin/openapi3/tizen-petstore.sh → bin/openapi3/cpp-tizen-petstore.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/tizen $@"
+ags="generate -t modules/openapi-generator/src/main/resources/tizen -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-tizen -o samples/client/petstore/cpp-tizen $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/security/qt5cpp-petstore.sh → bin/security/cpp-qt5-petstore.sh b/bin/security/qt5cpp-petstore.sh → bin/security/cpp-qt5-petstore.sh
@@ -27,6 +27,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/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/qt5cpp $@"
+ags="generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -g cpp-qt5 -o samples/client/petstore-security-test/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/qt5cpp-petstore.bat → bin/windows/cpp-qt5-petstore.bat b/bin/windows/qt5cpp-petstore.bat → bin/windows/cpp-qt5-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5 -o samples\client\petstore\qt5cpp
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-qt5 -o samples\client\petstore\cpp-qt5
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/cpprest-petstore.bat → bin/windows/cpp-restsdk-petstore.bat b/bin/windows/cpprest-petstore.bat → bin/windows/cpp-restsdk-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-restsdk -o samples\client\petstore\cpprest
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-restsdk -o samples\client\petstore\cpp-restsdk
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/tizen-petstore.bat → bin/windows/cpp-tizen-petstore.bat b/bin/windows/tizen-petstore.bat → bin/windows/cpp-tizen-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-tizen -o samples\client\petstore\tizen
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g cpp-tizen -o samples\client\petstore\cpp-tizen
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/migration-from-swagger-codegen.md b/docs/migration-from-swagger-codegen.md
@@ -49,7 +49,7 @@ You can find our released artefact on maven central:
 
 Old:
 
-```
+```xml
 <dependency>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-codegen</artifactId>
@@ -58,7 +58,7 @@ Old:
 
 New:
 
-```
+```xml
 <dependency>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator</artifactId>
@@ -67,7 +67,7 @@ New:
 
 **Cli:**
 
-```
+```xml
 <dependency>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-codegen-cli</artifactId>
@@ -76,7 +76,7 @@ New:
 
 New:
 
-```
+```xml
 <dependency>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-cli</artifactId>
@@ -85,7 +85,7 @@ New:
 
 **Maven plugin:**
 
-```
+```xml
 <dependency>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
@@ -94,7 +94,7 @@ New:
 
 New:
 
-```
+```xml
 <dependency>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
@@ -187,7 +187,7 @@ Example: `org.openapitools.codegen.DefaultGenerator`
 In OpenAPI spec v3, there's no body parameter, which is replaced by [Request Body Object](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#request-body-object). The parameter name for Request Body is named automatically based on the model name (e.g. User). To control how the "Request Body" parmaeter is named, please add the vendor extension `x-codegen-request-body-name` to the operation:
 
 OpenAPI Spec v3:
-```
+```yaml
 paths:
   /pet:
     post:
@@ -209,7 +209,7 @@ paths:
 ```
 
 OpenAPI Spec v2:
-```
+```yaml
 paths:
   /pet:
     post:

diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml
@@ -20,7 +20,6 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <excludes>
-                    <exclude>logback.xml</exclude>
                 </excludes>
             </resource>
         </resources>
@@ -78,6 +77,12 @@
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--https://github.com/airlift/airline-->
         <dependency>
@@ -91,9 +96,9 @@
             <version>2.3.3</version>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-version}</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.0.13</version>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/modules/openapi-generator-cli/src/main/resources/logback.xml b/modules/openapi-generator-cli/src/main/resources/logback.xml
@@ -1,12 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-        </layout>
+        <target>System.out</target>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>DENY</onMatch>
+            <onMismatch>NEUTRAL</onMismatch>
+        </filter>
     </appender>
-    <logger name="io.swagger" level="debug"/>
-    <root level="error">
+    <appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
+        <target>System.err</target>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
+    <logger name="io.swagger" level="warn">
         <appender-ref ref="STDOUT"/>
+        <appender-ref ref="STDERR"/>
+    </logger>
+    <logger name="org.openapitools" level="info">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="STDERR"/>
+    </logger>
+    <root level="error">
+        <appender-ref ref="STDERR"/>
     </root>
 </configuration>
diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml
@@ -243,11 +243,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j-version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${slf4j-version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>