Merged master

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,8 @@
 
 - [ ] Read the [contribution guidelines](https://github.com/swagger-api/swagger-codegen/blob/master/CONTRIBUTING.md).
 - [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`.
-- [ ] Filed the PR against the correct branch: master for non-breaking changes and `2.3.0` branch for breaking (non-backward compatible) changes.
+- [ ] Filed the PR against the correct branch: `3.0.0` branch for changes related to OpenAPI spec 3.0. Default: `master`.
+- [ ] Copied the [technical committee](https://github.com/swagger-api/swagger-codegen/#swagger-codegen-technical-committee) to review the pull request if your PR is targeting a particular programming language.
 
 ### Description of the PR
 

.gitignore

@@ -1,3 +1,4 @@
+.vscode
 *.iml
 out/
 *.ipr
@@ -73,6 +74,7 @@ samples/client/petstore/java/okhttp-gson/build/
 samples/client/petstore/java/feign/build/
 samples/client/petstore/java/retrofit/build/
 samples/client/petstore/java/retrofit2/build/
+samples/client/petstore/java/retrofit2/hello.txt
 samples/client/petstore/java/retrofit2rx/build/
 samples/client/petstore/java/default/build/
 samples/client/petstore/scala/build/
@@ -88,6 +90,11 @@ samples/client/petstore/silex/SwaggerServer/venodr/
 **/vendor/
 **/composer.lock
 
+#PHP-Symfony
+samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/cache/
+samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/logs/
+
+
 # Perl
 samples/client/petstore/perl/deep_module_test/
 
@@ -158,7 +165,25 @@ samples/client/petstore/typescript-fetch/**/dist/
 samples/client/petstore/typescript-fetch/**/typings
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
 samples/client/petstore/typescript-node/npm/npm-debug.log
+samples/client/petstore/typescript-aurelia/**/dist/
+samples/client/petstore/typescript-angular/tsd-debug.log
 
 # aspnetcore
 samples/server/petstore/aspnetcore/.vs/
 effective.pom
+# kotlin
+samples/client/petstore/kotlin/src/main/kotlin/test/
+\?
+
+# haskell
+.stack-work
+.cabal-sandbox
+cabal.project.local
+
+# R
+.Rproj.user
+
+# elixir
+samples/client/petstore/elixir/_build/
+samples/client/petstore/elixir/deps/
+samples/client/petstore/elixir/mix.lock

.java-version

@@ -0,0 +1 @@
+oracle64-1.8.0.152

.travis.yml

@@ -1,6 +1,8 @@
 sudo: required
-language: objective-c
-osx_image: xcode8.2
+language: java
+jdk:
+  - oraclejdk8
+
 cache:
   directories:
   - $HOME/.m2
@@ -22,66 +24,48 @@ cache:
   - $HOME/samples/client/petstore/typescript-fetch/npm/with-npm-version/typings
   - $HOME/samples/client/petstore/typescript-angular/node_modules
   - $HOME/samples/client/petstore/typescript-angular/typings
-  - $HOME/.cocoapods/repos/master
-# note: docker is not yet supported in iOS build
-#services:
-#  - docker
+
+services:
+  - docker
 
 # comment out the host table change to use the public petstore server
 addons:
   hosts:
     - petstore.swagger.io
 
 before_install:
-  - export SW=`pwd`
-  - rvm list
-  - rvm use 2.2.5
-  - 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
-  - pod --version
-  # comment out below to avoid errors
-  #- pod repo update
-  - pod setup --silent > /dev/null
+  # required when sudo: required for the Ruby petstore tests
+  - gem install bundler
   - npm install -g typescript
+  - npm install -g npm
   - npm config set registry http://registry.npmjs.org/
-  - brew install sbt
-  - brew install leiningen
-  - brew install bats
-  - brew install curl
-  - brew install python3
-  - pip install virtualenv
-  # start local petstore server
-  - git clone -b docker --single-branch https://github.com/wing328/swagger-samples
-  - cd swagger-samples/java/java-jersey-jaxrs
-  - sudo mvn jetty:run &
-  - cd $SW
-  # NOTE: iOS build not support docker at the moment
+  - sudo pip install virtualenv
   # to run petstore server locally via docker
-  #- docker pull swaggerapi/petstore
-  #- docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
-  #- docker ps -a
+  - docker pull swaggerapi/petstore
+  - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
+  - docker ps -a
+  # Add bats test framework and cURL for Bash script integration tests
+  - sudo add-apt-repository ppa:duggan/bats --yes
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq bats
+  - sudo apt-get install -qq curl
+  # comment out below as installation failed in travis
   # Add rebar3 build tool and recent Erlang/OTP for Erlang petstore server tests.
   # - Travis CI does not support rebar3 [yet](https://github.com/travis-ci/travis-ci/issues/6506#issuecomment-275189490).
   # - Rely on `kerl` for [pre-compiled versions available](https://docs.travis-ci.com/user/languages/erlang#Choosing-OTP-releases-to-test-against). Rely on installation path chosen by [`travis-erlang-builder`](https://github.com/travis-ci/travis-erlang-builder/blob/e6d016b1a91ca7ecac5a5a46395bde917ea13d36/bin/compile#L18).
+  # - . ~/otp/18.2.1/activate && erl -version
+  #- curl -f -L -o ./rebar3 https://s3.amazonaws.com/rebar3/rebar3 && chmod +x ./rebar3 && ./rebar3 version && export PATH="${TRAVIS_BUILD_DIR}:$PATH"
 
   # show host table to confirm petstore.swagger.io is mapped to localhost
   - cat /etc/hosts
   # show java version
   - java -version
-  # show brew version
-  - brew --version
-  # show xcpretty version
-  - xcpretty -v
-  # show go version
-  - go version
 
 install:
   # Add Godeps dependencies to GOPATH and PATH
-   - eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.4 bash)"
-   - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace"
-   - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
+  - eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.4 bash)"
+  - export GOPATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace"
+  - export PATH="${TRAVIS_BUILD_DIR}/Godeps/_workspace/bin:$PATH"
 
 script:
   # fail fast
@@ -94,17 +78,18 @@ script:
   - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
   # run integration tests defined in maven pom.xml
   - mvn -q --batch-mode verify -Psamples
-### docker-related tasks have been moved to CircleCI
+  # Below has been moved to CircleCI
   # docker: build generator image and push to Docker Hub
   #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/swagger-generator && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi
   ## docker: build cli image and push to Docker Hub
   #- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi
-#env:
-#  - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli
 
 after_success:
   # push a snapshot version to maven repo
   - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_BRANCH" = "master" ]; then
       mvn clean deploy --settings .travis/settings.xml;
-      echo "Finished mvn clean deploy";
+      echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
     fi;
+
+env:
+  - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli

.travis.yml.bash

@@ -0,0 +1,37 @@
+sudo: required
+language: java
+jdk:
+  - openjdk8
+
+cache:
+  directories:
+  - $HOME/.m2
+  - $HOME/.ivy2
+
+services:
+  - docker
+
+addons:
+  hosts:
+    - petstore.swagger.io
+
+before_install:
+  # to run petstore server locally via docker
+  - docker pull swaggerapi/petstore
+  - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
+  - docker ps -a
+  # Add bats test framework and cURL for Bash script integration tests
+  - sudo add-apt-repository ppa:duggan/bats --yes
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq bats
+  - sudo apt-get install -qq curl
+
+  # show host table to confirm petstore.swagger.io is mapped to localhost
+  - cat /etc/hosts
+
+script:
+  # fail fast
+  - set -e
+  # run integration tests defined in maven pom.xml
+  - cp pom.xml.bash pom.xml
+  - mvn --batch-mode verify -Psamples

CONTRIBUTING.md

@@ -35,26 +35,31 @@ For a list of variables available in the template, please refer to this [page](h
 
 ### Style guide
 Code change should conform to the programming style guide of the respective languages:
+- Ada: https://en.wikibooks.org/wiki/Ada_Style_Guide/Source_Code_Presentation
 - Android: https://source.android.com/source/code-style.html
 - Bash: https://github.com/bahamas10/bash-style-guide
 - C#: https://msdn.microsoft.com/en-us/library/vstudio/ff926074.aspx
 - C++: https://google.github.io/styleguide/cppguide.html
 - C++ (Tizen): https://wiki.tizen.org/Native_Platform_Coding_Idiom_and_Style_Guide#C.2B.2B_Coding_Style
 - Clojure: https://github.com/bbatsov/clojure-style-guide
 - Elixir: https://github.com/christopheradams/elixir_style_guide
+- Eiffel: https://www.eiffel.org/doc/eiffel/Coding%20Standards
 - Erlang: https://github.com/inaka/erlang_guidelines
 - Haskell: https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md
 - Java: https://google.github.io/styleguide/javaguide.html
 - JavaScript: https://github.com/airbnb/javascript/
+- Kotlin: https://kotlinlang.org/docs/reference/coding-conventions.html
 - Groovy: http://groovy-lang.org/style-guide.html
 - Go: https://github.com/golang/go/wiki/CodeReviewComments
 - ObjC: https://github.com/NYTimes/objective-c-style-guide
 - Perl: http://perldoc.perl.org/perlstyle.html
 - PHP: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
+- PowerShell: https://msdn.microsoft.com/en-us/library/dd878270(v=vs.85).aspx
 - Python: https://www.python.org/dev/peps/pep-0008/
+- R: https://google.github.io/styleguide/Rguide.xml
 - Ruby: https://github.com/bbatsov/ruby-style-guide
 - Scala: http://docs.scala-lang.org/style/
-- Swift: https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/TheBasics.html
+- Swift: [Apple Developer](https://developer.apple.com/library/prerelease/ios/documentation/Swift/Conceptual/Swift_Programming_Language/TheBasics.html)
 - TypeScript: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
 
 For other languages, feel free to suggest.
@@ -87,3 +92,4 @@ To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all t
 - File a PR with meaningful title, description and commit messages. A good example is [PR-3306](https://github.com/swagger-api/swagger-codegen/pull/3306)
 - Recommended git settings
    - `git config --global core.autocrlf input` to tell Git convert CRLF to LF on commit but not the other way around 
+- To close an issue (e.g. issue 1542) automatically after a PR is merged, use keywords "fix", "close", "resolve" in the PR description, e.g. `fix #1542`. (Ref: [closing issues using keywords](https://help.github.com/articles/closing-issues-using-keywords/))

Dockerfile

@@ -1,22 +1,31 @@
 FROM jimschubert/8-jdk-alpine-mvn:1.0
 
-ENV GEN_DIR /opt/swagger-codegen
-
 RUN set -x && \
     apk add --no-cache bash
 
-RUN mkdir /opt
+ENV GEN_DIR /opt/swagger-codegen
+WORKDIR ${GEN_DIR}
+VOLUME  ${MAVEN_HOME}/.m2/repository
 
-ADD . ${GEN_DIR}
+# Required from a licensing standpoint
+COPY ./LICENSE ${GEN_DIR}
 
-VOLUME  ${MAVEN_HOME}/.m2/repository
+# Required to compile swagger-codegen
+COPY ./google_checkstyle.xml ${GEN_DIR}
 
-WORKDIR ${GEN_DIR}
+# Modules are copied individually here to allow for caching of docker layers between major.minor versions
+# NOTE: swagger-generator is not included here, it is available as swaggerapi/swagger-generator
+COPY ./modules/swagger-codegen-maven-plugin ${GEN_DIR}/modules/swagger-codegen-maven-plugin
+COPY ./modules/swagger-codegen-cli ${GEN_DIR}/modules/swagger-codegen-cli
+COPY ./modules/swagger-codegen ${GEN_DIR}/modules/swagger-codegen
+COPY ./pom.xml ${GEN_DIR}
 
+# Pre-compile swagger-codegen-cli
 RUN mvn -am -pl "modules/swagger-codegen-cli" package
 
+# This exists at the end of the file to benefit from cached layers when modifying docker-entrypoint.sh.
 COPY docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-CMD ["build"]
+CMD ["help"]