removed Java 7 as an option on README.

prepare release 3.0.0-rc0

.github/ISSUE_TEMPLATE.md

@@ -7,11 +7,11 @@ Also please indicate in the issue title which language/library is concerned. Eg:
 
 <!-- describe what is the question, suggestion or issue and why this is a problem for you. -->
 
-##### openapi-generator version
+##### Swagger-codegen version
 
-<!-- which version of openapi-generator are you using, is it a regression? -->
+<!-- which version of swagger-codegen are you using, is it a regression? -->
 
-##### OpenAPI declaration file content or url
+##### Swagger declaration file content or url
 
 <!-- if it is a bug, a json or yaml that produces it.
 If you post the code inline, please wrap it with
@@ -37,7 +37,7 @@ link it here.
 
 ##### Related issues/PRs
 
-<!-- has a similar issue/PR been reported/opened before? Please do a search in https://github.com/openapitools/openapi-generator/issues?utf8=%E2%9C%93&q=is%3Aissue%20 -->
+<!-- has a similar issue/PR been reported/opened before? Please do a search in https://github.com/swagger-api/swagger-codegen/issues?utf8=%E2%9C%93&q=is%3Aissue%20 -->
 
 ##### Suggest a fix/enhancement
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,9 @@
 ### PR checklist
 
-- [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md).
+- [ ] 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](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.4.x`, `4.0.x`. Default: `master`.
-- [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language.
+- [ ] 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

@@ -3,11 +3,9 @@
 out/
 *.ipr
 *.iws
-*.gpg
 classpath.txt
 version.properties
-modules/openapi-generator-gradle-plugin/bin/
-!modules/openapi-generator-cli/src/main/resources/version.properties
+!modules/swagger-codegen-cli/src/main/resources/version.properties
 .project
 .classpath
 lib/*
@@ -52,7 +50,6 @@ samples/server/petstore/nodejs/node_modules
 samples/server/petstore/nodejs-server/node_modules
 
 # qt5 cpp
-*.pro.user
 samples/client/petstore/qt5cpp/PetStore/moc_*
 samples/client/petstore/qt5cpp/PetStore/*.o
 samples/client/petstore/qt5cpp/build-*
@@ -60,12 +57,6 @@ samples/client/petstore/qt5cpp/PetStore/PetStore
 samples/client/petstore/qt5cpp/PetStore/Makefile
 samples/client/petstore/qt5cpp/PetStore/PetStore.pro.user
 
-# cpprestsdk
-samples/client/petstore/cpp-restsdk/CMakeCache.txt
-samples/client/petstore/cpp-restsdk/CMakeFiles/
-samples/client/petstore/cpp-restsdk/Makefile
-samples/client/petstore/cpp-restsdk/cmake_install.cmake
-
 #Java/Android
 **/.gradle
 samples/client/petstore/java/hello.txt
@@ -90,9 +81,19 @@ samples/client/petstore/scala/build/
 samples/client/petstore/java/resttemplate/hello.txt
 samples/client/petstore/java/retrofit2/hello.txt
 samples/client/petstore/java/feign/hello.txt
-samples/client/petstore/java/jersey2-java6/project/
-samples/client/petstore/java/jersey2-java8/project/
-samples/client/petstore/java/jersey2/project/
+
+#PHP
+samples/client/petstore/php/SwaggerClient-php/composer.lock
+samples/client/petstore/php/SwaggerClient-php/vendor/
+samples/client/petstore/silex/SwaggerServer/composer.lock
+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/
@@ -116,14 +117,14 @@ samples/client/petstore/swift/**/SwaggerClientTests/SwaggerClient.xcworkspace/xc
 samples/client/petstore/swift/**/SwaggerClientTests/Pods/
 #samples/client/petstore/swift/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
 #samples/client/petstore/swift/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
-samples/client/petstore/swift/**/SwaggerClientTests/Podfile.lock
+samples/client/petstore/swift/**/SwaggerClientTests/Podfile.lock 
 # Swift3
 samples/client/petstore/swift3/**/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
 samples/client/petstore/swift3/**/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
 #samples/client/petstore/swift3/**/SwaggerClientTests/Pods/
 #samples/client/petstore/swift3/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
 #samples/client/petstore/swift3/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
-samples/client/petstore/swift3/**/SwaggerClientTests/Podfile.lock
+samples/client/petstore/swift3/**/SwaggerClientTests/Podfile.lock 
 
 # C#
 *.csproj.user
@@ -155,9 +156,6 @@ samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
 samples/client/petstore/python/.coverage
 samples/client/petstore/python/.projectile
 samples/client/petstore/python/.venv/
-samples/client/petstore/python-asyncio/.venv/
-samples/client/petstore/python-asyncio/.pytest_cache/
-samples/client/petstore/python-tornado/.venv/
 
 # ts
 samples/client/petstore/typescript-node/npm/node_modules
@@ -175,9 +173,6 @@ samples/server/petstore/aspnetcore/.vs/
 effective.pom
 # kotlin
 samples/client/petstore/kotlin/src/main/kotlin/test/
-samples/client/petstore/kotlin-threetenbp/build
-samples/client/petstore/kotlin-string/build
-samples/server/petstore/kotlin-server/ktor/build
 \?
 
 # haskell
@@ -192,23 +187,3 @@ cabal.project.local
 samples/client/petstore/elixir/_build/
 samples/client/petstore/elixir/deps/
 samples/client/petstore/elixir/mix.lock
-
-# groovy
-samples/client/petstore/groovy/build
-
-# erlang
-samples/client/petstore/erlang-client/_build/
-samples/client/petstore/erlang-client/rebar.lock
-samples/server/petstore/erlang-server/_build/
-samples/server/petstore/erlang-server/rebar.lock
-
-# dart
-samples/client/petstore/dart/petstore/packages
-samples/client/petstore/dart/flutter_petstore/test/packages
-samples/client/petstore/dart/petstore/test/packages
-
-# JS
-samples/client/petstore/javascript/package-lock.json
-
-# elm
-samples/client/petstore/elm/index.html

.hub.cli.dockerfile

@@ -1,36 +0,0 @@
-## The builder labeled image acts as a transient container which is meant to
-## hold all non-artifact code.
-##
-## You can build _just_ this part with:
-##     docker --target builder -t container-name:builder -f .hub.cli.dockerfile .
-FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
-
-RUN set -x && \
-    apk add --no-cache bash
-
-ENV GEN_DIR /opt/openapi-generator
-WORKDIR ${GEN_DIR}
-COPY . ${GEN_DIR}
-
-# Pre-compile openapi-generator-cli
-RUN mvn -am -pl "modules/openapi-generator-cli" package
-
-## The final (release) image
-## The resulting container here only needs the target jar
-## and ca-certificates (to be able to query HTTPS hosted specs)
-FROM openjdk:8-jre-alpine
-
-ENV GEN_DIR /opt/openapi-generator
-
-RUN apk --no-cache add ca-certificates bash
-RUN mkdir -p ${GEN_DIR}/modules/openapi-generator-cli/target
-
-WORKDIR ${GEN_DIR}/modules/openapi-generator-cli/target
-
-COPY --from=builder ${GEN_DIR}/modules/openapi-generator-cli/target/openapi-generator-cli.jar ${GEN_DIR}/modules/openapi-generator-cli/target/openapi-generator-cli.jar
-
-COPY docker-entrypoint.sh /usr/local/bin/
-
-ENTRYPOINT ["docker-entrypoint.sh"]
-
-CMD ["help"]

.hub.online.dockerfile

@@ -1,35 +0,0 @@
-## The builder labeled image acts as a transient container which is meant to
-## hold all non-artifact code.
-##
-## You can build _just_ this part with:
-##     docker --target builder -t container-name:builder -f .hub.online.dockerfile .
-FROM jimschubert/8-jdk-alpine-mvn:1.0 as builder
-
-RUN set -x && \
-    apk add --no-cache bash
-
-ENV GEN_DIR /opt/openapi-generator
-WORKDIR ${GEN_DIR}
-COPY . ${GEN_DIR}
-
-# Pre-compile openapi-generator-online
-RUN mvn -am -pl "modules/openapi-generator-online" package
-
-## The final (release) image
-## The resulting container here only needs the target jar
-FROM openjdk:8-jre-alpine
-
-ENV GEN_DIR /opt/openapi-generator
-ENV TARGET_DIR /generator
-
-RUN mkdir -p ${TARGET_DIR}
-
-WORKDIR ${TARGET_DIR}
-
-COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator-online.jar ${TARGET_DIR}/openapi-generator-online.jar
-
-ENV GENERATOR_HOST=http://localhost
-
-EXPOSE 8080
-
-CMD ["java", "-jar", "/generator/openapi-generator-online.jar"]

.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip

.travis.yml

@@ -1,8 +1,7 @@
 sudo: required
 language: java
 jdk:
-  - openjdk8
-
+  - oraclejdk8
 
 cache:
   directories:
@@ -10,9 +9,8 @@ cache:
   - $HOME/.ivy2
   - $HOME/.gradle/caches/
   - $HOME/.gradle/wrapper/
-  - $HOME/samples/client/petstore/javascript/node_modules
-  - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor
-  - $HOME/samples/client/petstore/ruby/vendor/bundle
+  - $HOME/samples/client/petstore/php/SwaggerClient-php/vendor
+  - $HOME/samples/client/petstore/ruby/venodr/bundle
   - $HOME/samples/client/petstore/python/.venv/
   - $HOME/samples/client/petstore/typescript-node/npm/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/typings/
@@ -26,44 +24,22 @@ 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/samples/server/petstore/rust-server/target
-  - $HOME/perl5
-  - $HOME/.cargo
-  - $HOME/.stack
-  - $HOME/.pub-cache
-  - $HOME/samples/server/petstore/cpp-pistache/pistache
-  - $HOME/.npm  
-  - $HOME/.rvm/gems/ruby-2.4.1
 
 services:
   - docker
 
 # comment out the host table change to use the public petstore server
 addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-5
-  chrome: stable
   hosts:
     - petstore.swagger.io
 
 before_install:
-  # install haskell
-  - curl -sSL https://get.haskellstack.org/ | sh
-  - stack upgrade
-  - stack --version
-  # install rust
-  - curl https://sh.rustup.rs -sSf | sh -s -- -y -v
   # required when sudo: required for the Ruby petstore tests
   - gem install bundler
   - npm install -g typescript
   - npm install -g npm
-  - npm install -g elm@0.18.0-exp5
   - npm config set registry http://registry.npmjs.org/
-  # set python 3.6.3 as default
-  - source ~/virtualenv/python3.6/bin/activate
+  - 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
@@ -73,16 +49,6 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq bats
   - sudo apt-get install -qq curl
-  # install dart
-  #- sudo apt-get update
-  - sudo apt-get install apt-transport-https
-  - sudo sh -c 'curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
-  - sudo sh -c 'curl https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
-  - sudo apt-get update
-  - sudo apt-get install dart
-  # install perl module
-  #- cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
-  #- cpanm Test::Exception Test::More Log::Any LWP::UserAgent JSON URI:Query Module::Runtime DateTime Module::Find Moose::Role
   # 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).
@@ -94,23 +60,12 @@ before_install:
   - cat /etc/hosts
   # show java version
   - java -version
-  - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      openssl aes-256-cbc -K $encrypted_6e2c8bba47c6_key -iv $encrypted_6e2c8bba47c6_iv -in sec.gpg.enc -out sec.gpg -d ;
-      gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY ;
-      gpg --check-trustdb ;
-    fi;
 
 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:$HOME/.cargo/bin:$PATH:/usr/lib/dart/bin"
-  #- go version
-  - gcc -v
-  - echo $CC
-  - echo $CXX
-  - pub version
-  - dart --version
+  - 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
@@ -122,33 +77,20 @@ script:
   # fail if generators contain tab '\t'
   - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
   # run integration tests defined in maven pom.xml
-  - mvn --quiet clean install
-  - mvn --quiet verify -Psamples
-after_success:
-  # push to maven repo
-  - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      if [ "$TRAVIS_BRANCH" = "master" ]; then
-        mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
-        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
-        pushd .;
-        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
-        echo "Finished ./gradlew uploadArchives";
-        popd;
-      elif ([[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]) ; then
-        mvn clean deploy --settings CI/settings.xml;
-        echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
-        pushd .;
-        cd modules/openapi-generator-gradle-plugin;
-        ./gradlew -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
-        echo "Finished ./gradlew uploadArchives";
-        popd;
-      fi;
-    fi;
-  ## docker: build and push openapi-generator-online to DockerHub
-  - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online && 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 && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME"; fi; fi
+  - mvn clean install
+  - mvn -q --batch-mode verify -Psamples
+  # 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 echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-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 && echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; fi; fi
+  #- 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
+
+#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 for $TRAVIS_BRANCH";
+#    fi;
 
 env:
-  - DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5
+  - DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli

.travis/settings.xml

@@ -0,0 +1,18 @@
+<settings>
+  <localRepository/>
+  <interactiveMode/>
+  <usePluginRegistry/>
+  <offline/>
+  <pluginGroups/>
+  <servers>
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${env.SONATYPE_USERNAME}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+  <mirrors/>
+  <proxies/>
+  <profiles/>
+  <activeProfiles/>
+</settings>

CI/.travis.yml.ios

@@ -1,67 +0,0 @@
-sudo: required
-language: objective-c
-osx_image: xcode8.1
-cache:
-  directories:
-  - $HOME/.m2
-  - $HOME/.ivy2
-  - $HOME/.gradle/caches/
-  - $HOME/.gradle/wrapper/
-  - $HOME/.stack
-  - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor
-  - $HOME/samples/client/petstore/ruby/venodr/bundle
-  - $HOME/samples/client/petstore/python/.venv/
-  - $HOME/samples/client/petstore/typescript-node/npm/node_modules
-  - $HOME/samples/client/petstore/typescript-node/npm/typings/
-  - $HOME/samples/client/petstore/typescript-fetch/tests/default/node_modules
-  - $HOME/samples/client/petstore/typescript-fetch/tests/default/typings
-  - $HOME/samples/client/petstore/typescript-fetch/builds/default/node_modules
-  - $HOME/samples/client/petstore/typescript-fetch/builds/default/typings
-  - $HOME/samples/client/petstore/typescript-fetch/builds/es6-target/node_modules
-  - $HOME/samples/client/petstore/typescript-fetch/builds/es6-target/typings
-  - $HOME/samples/client/petstore/typescript-fetch/builds/with-npm-version/node_modules
-  - $HOME/samples/client/petstore/typescript-fetch/npm/with-npm-version/typings
-  - $HOME/samples/client/petstore/typescript-angularjs/node_modules
-  - $HOME/samples/client/petstore/typescript-angularjs/typings
-  - $HOME/.cocoapods/repos/master
-  timeout: 1000
-
-# 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.3.3
-  - 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
-  - mkdir -p ~/.local/bin
-  - export PATH=$HOME/.local/bin:$PATH
-  # 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
-
-  # 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
-
-script:
-  # run integration tests defined in maven pom.xml
-  - mvn -q --batch-mode verify -Psamples

CI/.travis.yml.jdk6

@@ -1,29 +0,0 @@
-dist: trusty
-sudo: required
-language: java
-addons:
-  apt:
-    packages:
-      - openjdk-6-jdk
-jdk: openjdk6
-
-cache:
-  directories:
-  - $HOME/.m2
-  - $HOME/.ivy2
-  - $HOME/.gradle/caches/
-  - $HOME/.gradle/wrapper/
-
-install:
-   - jdk_switcher use openjdk6 
-   - java -version
-   - curl -s "https://get.sdkman.io" | bash
-   - source "$HOME/.sdkman/bin/sdkman-init.sh"
-   - sdk version
-   - sdk install gradle 2.9
-   - sdk list gradle
-   - sdk version
-   - gradle --version
-
-script:
-  - cd samples/client/petstore/java/jersey2-java6 && gradle test

CI/circle_parallel.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# A bash script to run CircleCI node/test in parallel
-#
-
-NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
-
-if [ "$NODE_INDEX" = "1" ]; then
-  echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
-  #cp CI/pom.xml.circleci pom.xml
-  java -version
-  mvn --quiet verify -Psamples.circleci
-elif [ "$NODE_INDEX" = "2" ]; then
-  echo "Running node $NODE_INDEX to test ensure-up-to-date"
-  java -version
-  #export GO_POST_PROCESS_FILE="/usr/local/bin/gofmt -w"
-  # not formatting the code as different go versions may format the code a bit different
-  #./bin/utils/ensure-up-to-date
-else
-  echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..."
-  sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
-  java -version
-  #cp CI/pom.xml.circleci.java7 pom.xml
-  mvn --quiet verify -Psamples.circleci.jdk7
-fi
-
-

CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{19F1DEBC-DE5E-4517-8062-F000CD499087}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Org.OpenAPITools.Test</RootNamespace>
-    <AssemblyName>Org.OpenAPITools.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="JsonSubTypes">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.2.0\lib\net45\JsonSubTypes.dll</HintPath>
-    </Reference>
-    <Reference Include="RestSharp">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-        <HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\packages')">..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\packages')">..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-        <HintPath Condition="Exists('..\..\vendor')">..\..\vendor\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="obj\**" />
-  </ItemGroup>
-  <ItemGroup>
-      <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MsBuildToolsPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-      <ProjectReference Include="..\Org.OpenAPITools\Org.OpenAPITools.csproj">
-          <Project>{321C8C3F-0156-40C1-AE42-D59761FB9B6C}</Project>
-          <Name>Org.OpenAPITools</Name>
-      </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="linux-logo.png" />
-  </ItemGroup>
-</Project>
-

CI/samples.ci/client/petstore/java/jersey2-java6/build.gradle

@@ -1,122 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        jcenter {
-            url "http://jcenter.bintray.com/"
-        }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter {
-        url "http://jcenter.bintray.com/"
-    }
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_6
-            targetCompatibility JavaVersion.VERSION_1_6
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    sourceCompatibility = JavaVersion.VERSION_1_6
-    targetCompatibility = JavaVersion.VERSION_1_6
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-jersey2-java6'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-ext {
-    swagger_annotations_version = "1.5.20"
-    jackson_version = "2.9.6"
-    jersey_version = "2.6"
-    commons_io_version=2.5
-    commons_lang3_version=3.6
-    junit_version = "4.12"
-    threetenbp_version = "2.6.4"
-}
-
-dependencies {
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_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 "commons-io:commons-io:$commons_io_version"
-    compile "org.apache.commons:commons-lang3:$commons_lang3_version"
-    compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
-    compile "com.brsanthu:migbase64:2.2"
-    testCompile "junit:junit:$junit_version"
-}

CI/samples.ci/client/petstore/java/test-manual/common/ConfigurationTest.java

@@ -1,15 +0,0 @@
-package org.openapitools.client;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ConfigurationTest {
-    @Test
-    public void testDefaultApiClient() {
-        ApiClient apiClient = Configuration.getDefaultApiClient();
-        assertNotNull(apiClient);
-        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
-        assertFalse(apiClient.isDebugging());
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/common/StringUtilTest.java

@@ -1,33 +0,0 @@
-package org.openapitools.client;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class StringUtilTest {
-    @Test
-    public void testContainsIgnoreCase() {
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
-        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
-
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
-        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
-    }
-
-    @Test
-    public void testJoin() {
-        String[] array = {"aa", "bb", "cc"};
-        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
-        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
-        assertEquals("aabbcc", StringUtil.join(array, ""));
-        assertEquals("aa bb cc", StringUtil.join(array, " "));
-        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
-
-        assertEquals("", StringUtil.join(new String[]{}, ","));
-        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java

@@ -1,292 +0,0 @@
-package org.openapitools.client;
-
-import org.openapitools.client.auth.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiClientTest {
-    ApiClient apiClient = null;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-    }
-
-    @Test
-    public void testParseAndFormatDate() {
-        // default date format
-        String dateStr = "2015-11-07T03:49:09.356Z";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
-
-        // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
-        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
-        apiClient.setDateFormat(format);
-        dateStr = "2015-11-07T13:49:09+10:00";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
-    }
-
-    @Test
-    public void testIsJsonMime() {
-        assertFalse(apiClient.isJsonMime(null));
-        assertFalse(apiClient.isJsonMime(""));
-        assertFalse(apiClient.isJsonMime("text/plain"));
-        assertFalse(apiClient.isJsonMime("application/xml"));
-        assertFalse(apiClient.isJsonMime("application/jsonp"));
-        assertFalse(apiClient.isJsonMime("example/json"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
-
-        assertTrue(apiClient.isJsonMime("application/json"));
-        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/problem+json"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
-        assertTrue(apiClient.isJsonMime("application/json\t"));
-        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
-        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
-        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
-        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
-    }
-
-    @Test
-    public void testSelectHeaderAccept() {
-        String[] accepts = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{};
-        assertNull(apiClient.selectHeaderAccept(accepts));
-    }
-
-    @Test
-    public void testSelectHeaderContentType() {
-        String[] contentTypes = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-    }
-
-    @Test
-    public void testGetAuthentications() {
-        Map<String, Authentication> auths = apiClient.getAuthentications();
-
-        Authentication auth = auths.get("api_key");
-        assertNotNull(auth);
-        assertTrue(auth instanceof ApiKeyAuth);
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
-        assertEquals("header", apiKeyAuth.getLocation());
-        assertEquals("api_key", apiKeyAuth.getParamName());
-
-        auth = auths.get("petstore_auth");
-        assertTrue(auth instanceof OAuth);
-        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
-
-        assertNull(auths.get("unknown"));
-
-        try {
-            auths.put("my_auth", new HttpBasicAuth());
-            fail("the authentications returned should not be modifiable");
-        } catch (UnsupportedOperationException e) {
-        }
-    }
-
-    @Ignore("There is no more basic auth in petstore security definitions")
-    @Test
-    public void testSetUsernameAndPassword() {
-        HttpBasicAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof HttpBasicAuth) {
-                auth = (HttpBasicAuth) _auth;
-                break;
-            }
-        }
-        auth.setUsername(null);
-        auth.setPassword(null);
-
-        apiClient.setUsername("my-username");
-        apiClient.setPassword("my-password");
-        assertEquals("my-username", auth.getUsername());
-        assertEquals("my-password", auth.getPassword());
-
-        // reset values
-        auth.setUsername(null);
-        auth.setPassword(null);
-    }
-
-    @Test
-    public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof ApiKeyAuth) {
-                auth = (ApiKeyAuth) _auth;
-                break;
-            }
-        }
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-
-        apiClient.setApiKey("my-api-key");
-        apiClient.setApiKeyPrefix("Token");
-        assertEquals("my-api-key", auth.getApiKey());
-        assertEquals("Token", auth.getApiKeyPrefix());
-
-        // reset values
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-    }
-
-    @Test
-    public void testParameterToPairWhenNameIsInvalid() throws Exception {
-        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
-        List<Pair> pairs_b = apiClient.parameterToPair("", new Integer(1));
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPair("param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsEmptyString() throws Exception {
-        // single empty string
-        List<Pair> pairs = apiClient.parameterToPair("param-a", " ");
-        assertEquals(1, pairs.size());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsNotCollection() throws Exception {
-        String name = "param-a";
-        Integer value = 1;
-
-        List<Pair> pairs = apiClient.parameterToPair(name, value);
-
-        assertEquals(1, pairs.size());
-        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsCollection() throws Exception {
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        List<Pair> pairs = apiClient.parameterToPair("param-a", values);
-        assertEquals(0, pairs.size());
-    }
-
-    @Test
-    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
-        List<Integer> objects = new ArrayList<Integer>();
-        objects.add(new Integer(1));
-
-        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, objects);
-        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", objects);
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
-        // list of empty strings
-        List<String> strs = new ArrayList<String>();
-        strs.add(" ");
-        strs.add(" ");
-        strs.add(" ");
-
-        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
-
-        assertEquals(1, concatStrings.size());
-        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsCollection() throws Exception {
-        Map<String, String> collectionFormatMap = new HashMap<String, String>();
-        collectionFormatMap.put("csv", ",");
-        collectionFormatMap.put("tsv", "\t");
-        collectionFormatMap.put("ssv", " ");
-        collectionFormatMap.put("pipes", "|");
-        collectionFormatMap.put("", ","); // no format, must default to csv
-        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
-
-        String name = "param-a";
-
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        // check for multi separately
-        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
-        assertEquals(values.size(), multiPairs.size());
-        for (int i = 0; i < values.size(); i++) {
-            assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), multiPairs.get(i).getValue());
-        }
-
-        // all other formats
-        for (String collectionFormat : collectionFormatMap.keySet()) {
-            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
-
-            assertEquals(1, pairs.size());
-
-            String delimiter = collectionFormatMap.get(collectionFormat);
-            if (!delimiter.equals(",")) {
-                // commas are not escaped because they are reserved characters in URIs
-                delimiter = apiClient.escapeString(delimiter);
-            }
-            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
-
-            // must equal input values
-            assertEquals(values.size(), pairValueSplit.length);
-            for (int i = 0; i < values.size(); i++) {
-                assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), pairValueSplit[i]);
-            }
-        }
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/ApiKeyAuthTest.java

@@ -1,47 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.openapitools.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiKeyAuthTest {
-    @Test
-    public void testApplyToParamsInQuery() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
-
-        assertEquals(1, queryParams.size());
-        for (Pair queryParam : queryParams) {
-            assertEquals("my-api-key", queryParam.getValue());
-        }
-
-        // no changes to header parameters
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithPrefix() {
-            List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey1/auth/HttpBasicAuthTest.java

@@ -1,52 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.openapitools.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class HttpBasicAuthTest {
-    HttpBasicAuth auth = null;
-
-    @Before
-    public void setup() {
-        auth = new HttpBasicAuth();
-    }
-
-    @Test
-    public void testApplyToParams() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        auth.setUsername("my-username");
-        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
-        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username should be treated as empty string
-        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
-        expected = "Basic Om15LXBhc3N3b3Jk";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null password should be treated as empty string
-        auth.setUsername("my-username");
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
-        expected = "Basic bXktdXNlcm5hbWU6";
-        assertEquals(expected, headerParams.get("Authorization"));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey1/model/EnumValueTest.java

@@ -1,63 +0,0 @@
-package org.openapitools.client.model;
-
-import org.junit.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class EnumValueTest {
-
-    @Test
-    public void testEnumClass() {
-        assertEquals(EnumClass._ABC.toString(), "_abc");
-        assertEquals(EnumClass._EFG.toString(), "-efg");
-        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
-    }
-
-    @Test
-    public void testEnumTest() {
-        // test enum value
-        EnumTest enumTest = new EnumTest();
-        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
-        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
-        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
-
-        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
-
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
-
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
-
-        try {
-            // test serialization (object => json)
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-            ObjectWriter ow = mapper.writer();
-            String json = ow.writeValueAsString(enumTest);
-            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
-
-            // test deserialization (json => object)
-            EnumTest fromString = mapper.readValue(json, EnumTest.class);
-            assertEquals(fromString.getEnumString().toString(), "lower");
-            assertEquals(fromString.getEnumInteger().toString(), "1");
-            assertEquals(fromString.getEnumNumber().toString(), "1.1");
-
-        } catch (Exception e) {
-            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
-        }
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey2-java8/JSONTest.java

@@ -1,45 +0,0 @@
-package org.openapitools.client;
-
-import org.openapitools.client.model.Order;
-
-import java.lang.Exception;
-
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class JSONTest {
-    JSON json = null;
-    Order order = null;
-
-    @Before
-    public void setup() {
-        json = new JSON();
-        order = new Order();
-    }
-
-    @Test
-    public void testDefaultDate() throws Exception {
-        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-        final String dateStr = "2015-11-07T14:11:05.267Z";
-        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime::from));
-
-        String str = json.getContext(null).writeValueAsString(order);
-        Order o = json.getContext(null).readValue(str, Order.class);
-        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
-    }
-
-    @Test
-    public void testCustomDate() throws Exception {
-        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
-        final String dateStr = "2015-11-07T14:11:05-02:00";
-        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime::from));
-
-        String str = json.getContext(null).writeValueAsString(order);
-        Order o = json.getContext(null).readValue(str, Order.class);
-        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java

@@ -1,250 +0,0 @@
-package org.openapitools.client;
-
-import org.openapitools.client.auth.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiClientTest {
-    ApiClient apiClient = null;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-    }
-
-    @Test
-    public void testParseAndFormatDate() {
-        // default date format
-        String dateStr = "2015-11-07T03:49:09.356Z";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
-
-        // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
-        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
-        apiClient.setDateFormat(format);
-        dateStr = "2015-11-07T13:49:09+10:00";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
-    }
-
-    @Test
-    public void testIsJsonMime() {
-        assertFalse(apiClient.isJsonMime(null));
-        assertFalse(apiClient.isJsonMime(""));
-        assertFalse(apiClient.isJsonMime("text/plain"));
-        assertFalse(apiClient.isJsonMime("application/xml"));
-        assertFalse(apiClient.isJsonMime("application/jsonp"));
-        assertFalse(apiClient.isJsonMime("example/json"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
-
-        assertTrue(apiClient.isJsonMime("application/json"));
-        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/problem+json"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
-        assertTrue(apiClient.isJsonMime("application/json\t"));
-        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
-        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
-        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
-        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
-    }
-
-    @Test
-    public void testSelectHeaderAccept() {
-        String[] accepts = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{};
-        assertNull(apiClient.selectHeaderAccept(accepts));
-    }
-
-    @Test
-    public void testSelectHeaderContentType() {
-        String[] contentTypes = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-    }
-
-    @Test
-    public void testGetAuthentications() {
-        Map<String, Authentication> auths = apiClient.getAuthentications();
-
-        Authentication auth = auths.get("api_key");
-        assertNotNull(auth);
-        assertTrue(auth instanceof ApiKeyAuth);
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
-        assertEquals("header", apiKeyAuth.getLocation());
-        assertEquals("api_key", apiKeyAuth.getParamName());
-
-        auth = auths.get("petstore_auth");
-        assertTrue(auth instanceof OAuth);
-        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
-
-        assertNull(auths.get("unknown"));
-
-        try {
-            auths.put("my_auth", new HttpBasicAuth());
-            fail("the authentications returned should not be modifiable");
-        } catch (UnsupportedOperationException e) {
-        }
-    }
-
-    @Ignore("There is no more basic auth in petstore security definitions")
-    @Test
-    public void testSetUsernameAndPassword() {
-        HttpBasicAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof HttpBasicAuth) {
-                auth = (HttpBasicAuth) _auth;
-                break;
-            }
-        }
-        auth.setUsername(null);
-        auth.setPassword(null);
-
-        apiClient.setUsername("my-username");
-        apiClient.setPassword("my-password");
-        assertEquals("my-username", auth.getUsername());
-        assertEquals("my-password", auth.getPassword());
-
-        // reset values
-        auth.setUsername(null);
-        auth.setPassword(null);
-    }
-
-    @Test
-    public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof ApiKeyAuth) {
-                auth = (ApiKeyAuth) _auth;
-                break;
-            }
-        }
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-
-        apiClient.setApiKey("my-api-key");
-        apiClient.setApiKeyPrefix("Token");
-        assertEquals("my-api-key", auth.getApiKey());
-        assertEquals("Token", auth.getApiKeyPrefix());
-
-        // reset values
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-    }
-
-    @Test
-    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
-        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
-        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
-
-        // single empty string
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
-        assertEquals(1, pairs.size());
-
-        // list of empty strings
-        List<String> strs = new ArrayList<String>();
-        strs.add(" ");
-        strs.add(" ");
-        strs.add(" ");
-
-        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
-
-        assertEquals(1, concatStrings.size());
-        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
-        String name = "param-a";
-        Integer value = 1;
-
-        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
-
-        assertEquals(1, pairs.size());
-        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsCollection() throws Exception {
-        Map<String, String> collectionFormatMap = new HashMap<String, String>();
-        collectionFormatMap.put("csv", ",");
-        collectionFormatMap.put("tsv", "\t");
-        collectionFormatMap.put("ssv", " ");
-        collectionFormatMap.put("pipes", "\\|");
-        collectionFormatMap.put("", ","); // no format, must default to csv
-        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
-
-        String name = "param-a";
-
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        // check for multi separately
-        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
-        assertEquals(values.size(), multiPairs.size());
-
-        // all other formats
-        for (String collectionFormat : collectionFormatMap.keySet()) {
-            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
-
-            assertEquals(1, pairs.size());
-
-            String delimiter = collectionFormatMap.get(collectionFormat);
-            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
-
-            // must equal input values
-            assertEquals(values.size(), pairValueSplit.length);
-        }
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey2/JSONTest.java

@@ -1,58 +0,0 @@
-package org.openapitools.client;
-
-import org.openapitools.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.format.DateTimeFormatter;
-
-import static org.junit.Assert.*;
-
-
-public class JSONTest {
-    private JSON json = null;
-    private Order order = null;
-
-    @Before
-    public void setup() {
-        json = new ApiClient().getJSON();
-        order = new Order();
-    }
-
-    @Test
-    public void testDefaultDate() throws Exception {
-        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-        final String dateStr = "2015-11-07T14:11:05.267Z";
-        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime.FROM));
-
-        String str = json.getContext(null).writeValueAsString(order);
-        Order o = json.getContext(null).readValue(str, Order.class);
-        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
-    }
-
-    @Test
-    public void testCustomDate() throws Exception {
-        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
-        final String dateStr = "2015-11-07T14:11:05-02:00";
-        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime.FROM));
-
-        String str = json.getContext(null).writeValueAsString(order);
-        Order o = json.getContext(null).readValue(str, Order.class);
-        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
-    }
-
-    @Test
-    public void testSqlDateSerialization() throws Exception {
-        String str = json.getContext(null).writeValueAsString(new java.sql.Date(10));
-        assertEquals("\"1970-01-01\"", str);
-    }
-
-    @Test
-    public void testSqlDateDeserialization() throws Exception {
-        final String str = "1970-01-01";
-        java.sql.Date date = json.getContext(null).readValue("\"" + str + "\"", java.sql.Date.class);
-        assertEquals(date.toString(), str);
-    }
-
-}

CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/ApiKeyAuthTest.java

@@ -1,47 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.openapitools.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiKeyAuthTest {
-    @Test
-    public void testApplyToParamsInQuery() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
-
-        assertEquals(1, queryParams.size());
-        for (Pair queryParam : queryParams) {
-            assertEquals("my-api-key", queryParam.getValue());
-        }
-
-        // no changes to header parameters
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithPrefix() {
-            List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey2/auth/HttpBasicAuthTest.java

@@ -1,52 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.openapitools.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class HttpBasicAuthTest {
-    HttpBasicAuth auth = null;
-
-    @Before
-    public void setup() {
-        auth = new HttpBasicAuth();
-    }
-
-    @Test
-    public void testApplyToParams() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        auth.setUsername("my-username");
-        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
-        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username should be treated as empty string
-        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
-        expected = "Basic Om15LXBhc3N3b3Jk";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null password should be treated as empty string
-        auth.setUsername("my-username");
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
-        expected = "Basic bXktdXNlcm5hbWU6";
-        assertEquals(expected, headerParams.get("Authorization"));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/jersey2/model/EnumValueTest.java

@@ -1,63 +0,0 @@
-package org.openapitools.client.model;
-
-import org.junit.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class EnumValueTest {
-
-    @Test
-    public void testEnumClass() {
-        assertEquals(EnumClass._ABC.toString(), "_abc");
-        assertEquals(EnumClass._EFG.toString(), "-efg");
-        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
-    }
-
-    @Test
-    public void testEnumTest() {
-        // test enum value
-        EnumTest enumTest = new EnumTest();
-        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
-        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
-        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
-
-        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
-
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
-
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
-
-        try {
-            // test serialization (object => json)
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-            ObjectWriter ow = mapper.writer();
-            String json = ow.writeValueAsString(enumTest);
-            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
-
-            // test deserialization (json => object)
-            EnumTest fromString = mapper.readValue(json, EnumTest.class);
-            assertEquals(fromString.getEnumString().toString(), "lower");
-            assertEquals(fromString.getEnumInteger().toString(), "1");
-            assertEquals(fromString.getEnumNumber().toString(), "1.1");
-
-        } catch (Exception e) {
-            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
-        }
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/ApiClientTest.java

@@ -1,330 +0,0 @@
-package org.openapitools.client;
-
-import org.openapitools.client.auth.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.TimeZone;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiClientTest {
-    ApiClient apiClient;
-    JSON json;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-        json = apiClient.getJSON();
-    }
-
-    @Test
-    public void testIsJsonMime() {
-        assertFalse(apiClient.isJsonMime(null));
-        assertFalse(apiClient.isJsonMime(""));
-        assertFalse(apiClient.isJsonMime("text/plain"));
-        assertFalse(apiClient.isJsonMime("application/xml"));
-        assertFalse(apiClient.isJsonMime("application/jsonp"));
-        assertFalse(apiClient.isJsonMime("example/json"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
-
-        assertTrue(apiClient.isJsonMime("application/json"));
-        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/problem+json"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
-        assertTrue(apiClient.isJsonMime("application/json\t"));
-        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
-        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
-        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
-        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/json-patch+json"));
-    }
-
-    @Test
-    public void testSelectHeaderAccept() {
-        String[] accepts = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{};
-        assertNull(apiClient.selectHeaderAccept(accepts));
-    }
-
-    @Test
-    public void testSelectHeaderContentType() {
-        String[] contentTypes = {"application/json", "application/xml"};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
-        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"text/plain", "application/xml"};
-        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{};
-        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
-    }
-
-    @Test
-    public void testGetAuthentications() {
-        Map<String, Authentication> auths = apiClient.getAuthentications();
-
-        Authentication auth = auths.get("api_key");
-        assertNotNull(auth);
-        assertTrue(auth instanceof ApiKeyAuth);
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
-        assertEquals("header", apiKeyAuth.getLocation());
-        assertEquals("api_key", apiKeyAuth.getParamName());
-
-        auth = auths.get("petstore_auth");
-        assertTrue(auth instanceof OAuth);
-        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
-
-        assertNull(auths.get("unknown"));
-
-        try {
-            auths.put("my_auth", new HttpBasicAuth());
-            fail("the authentications returned should not be modifiable");
-        } catch (UnsupportedOperationException e) {
-        }
-    }
-
-    /*
-    @Test
-    public void testSetUsernameAndPassword() {
-        HttpBasicAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof HttpBasicAuth) {
-                auth = (HttpBasicAuth) _auth;
-                break;
-            }
-        }
-        auth.setUsername(null);
-        auth.setPassword(null);
-
-        apiClient.setUsername("my-username");
-        apiClient.setPassword("my-password");
-        assertEquals("my-username", auth.getUsername());
-        assertEquals("my-password", auth.getPassword());
-
-        // reset values
-        auth.setUsername(null);
-        auth.setPassword(null);
-    }
-    */
-
-    @Test
-    public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof ApiKeyAuth) {
-                auth = (ApiKeyAuth) _auth;
-                break;
-            }
-        }
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-
-        apiClient.setApiKey("my-api-key");
-        apiClient.setApiKeyPrefix("Token");
-        assertEquals("my-api-key", auth.getApiKey());
-        assertEquals("Token", auth.getApiKeyPrefix());
-
-        // reset values
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-    }
-
-    @Test
-    public void testGetAndSetConnectTimeout() {
-        // connect timeout defaults to 10 seconds
-        assertEquals(10000, apiClient.getConnectTimeout());
-        assertEquals(10000, apiClient.getHttpClient().getConnectTimeout());
-
-        apiClient.setConnectTimeout(0);
-        assertEquals(0, apiClient.getConnectTimeout());
-        assertEquals(0, apiClient.getHttpClient().getConnectTimeout());
-
-        apiClient.setConnectTimeout(10000);
-    }
-    
-    @Test
-    public void testGetAndSetReadTimeout() {
-        // read timeout defaults to 10 seconds
-        assertEquals(10000, apiClient.getReadTimeout());
-        assertEquals(10000, apiClient.getHttpClient().getReadTimeout());
-
-        apiClient.setReadTimeout(0);
-        assertEquals(0, apiClient.getReadTimeout());
-        assertEquals(0, apiClient.getHttpClient().getReadTimeout());
-
-        apiClient.setReadTimeout(10000);
-    }
-    
-    @Test
-    public void testGetAndSetWriteTimeout() {
-        // write timeout defaults to 10 seconds
-        assertEquals(10000, apiClient.getWriteTimeout());
-        assertEquals(10000, apiClient.getHttpClient().getWriteTimeout());
-
-        apiClient.setWriteTimeout(0);
-        assertEquals(0, apiClient.getWriteTimeout());
-        assertEquals(0, apiClient.getHttpClient().getWriteTimeout());
-
-        apiClient.setWriteTimeout(10000);
-    }
-    
-    @Test
-    public void testParameterToPairWhenNameIsInvalid() throws Exception {
-        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
-        List<Pair> pairs_b = apiClient.parameterToPair("", new Integer(1));
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPair("param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsEmptyString() throws Exception {
-        // single empty string
-        List<Pair> pairs = apiClient.parameterToPair("param-a", " ");
-        assertEquals(1, pairs.size());
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsNotCollection() throws Exception {
-        String name = "param-a";
-        Integer value = 1;
-
-        List<Pair> pairs = apiClient.parameterToPair(name, value);
-
-        assertEquals(1, pairs.size());
-        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
-    }
-
-    @Test
-    public void testParameterToPairWhenValueIsCollection() throws Exception {
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        List<Pair> pairs = apiClient.parameterToPair("param-a", values);
-        assertEquals(0, pairs.size());
-    }
-
-    @Test
-    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
-        List<Integer> objects = new ArrayList<Integer>();
-        objects.add(new Integer(1));
-
-        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, objects);
-        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", objects);
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsNull() throws Exception {
-        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
-        // list of empty strings
-        List<String> strs = new ArrayList<String>();
-        strs.add(" ");
-        strs.add(" ");
-        strs.add(" ");
-
-        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
-
-        assertEquals(1, concatStrings.size());
-        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
-    }
-
-    @Test
-    public void testParameterToPairsWhenValueIsCollection() throws Exception {
-        Map<String, String> collectionFormatMap = new HashMap<String, String>();
-        collectionFormatMap.put("csv", ",");
-        collectionFormatMap.put("tsv", "\t");
-        collectionFormatMap.put("ssv", " ");
-        collectionFormatMap.put("pipes", "|");
-        collectionFormatMap.put("", ","); // no format, must default to csv
-        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
-
-        String name = "param-a";
-
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        // check for multi separately
-        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
-        assertEquals(values.size(), multiPairs.size());
-        for (int i = 0; i < values.size(); i++) {
-            assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), multiPairs.get(i).getValue());
-        }
-
-        // all other formats
-        for (String collectionFormat : collectionFormatMap.keySet()) {
-            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
-
-            assertEquals(1, pairs.size());
-
-            String delimiter = collectionFormatMap.get(collectionFormat);
-            if (!delimiter.equals(",")) {
-                // commas are not escaped because they are reserved characters in URIs
-                delimiter = apiClient.escapeString(delimiter);
-            }
-            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
-
-            // must equal input values
-            assertEquals(values.size(), pairValueSplit.length);
-            for (int i = 0; i < values.size(); i++) {
-                assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), pairValueSplit[i]);
-            }
-        }
-    }
-
-    @Test
-    public void testSanitizeFilename() {
-        assertEquals("sun", apiClient.sanitizeFilename("sun"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("../sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("/var/tmp/sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("./sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("..\\sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("\\var\\tmp\\sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
-        assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/JSONTest.java

@@ -1,202 +0,0 @@
-package org.openapitools.client;
-
-import com.google.gson.reflect.TypeToken;
-
-import org.openapitools.client.model.Order;
-
-import java.lang.Exception;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import okio.ByteString;
-import org.junit.*;
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneId;
-import org.threeten.bp.ZoneOffset;
-import org.threeten.bp.format.DateTimeFormatter;
-
-import static org.junit.Assert.*;
-
-public class JSONTest {
-    private ApiClient apiClient = null;
-    private JSON json = null;
-    private Order order = null;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-        json = apiClient.getJSON();
-        order = new Order();
-    }
-
-    @Test
-    public void testSqlDateTypeAdapter() {
-        final String str = "\"2015-11-07\"";
-        final java.sql.Date date = java.sql.Date.valueOf("2015-11-07");
-
-        assertEquals(str, json.serialize(date));
-        assertEquals(json.deserialize(str, java.sql.Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356" + getCurrentTimezoneOffset() + "\"", java.sql.Date.class).toString(), date.toString());
-
-        // custom date format: without day
-        DateFormat format = new SimpleDateFormat("yyyy-MM", Locale.ROOT);
-        apiClient.setSqlDateFormat(format);
-        String dateStr = "\"2015-11\"";
-        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", java.sql.Date.class)));
-        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11\"", java.sql.Date.class)));
-    }
-
-    @Test
-    public void testDateTypeAdapter() {
-        Calendar cal = new GregorianCalendar(2015, 10, 7, 3, 49, 9);
-        cal.setTimeZone(TimeZone.getTimeZone("UTC"));
-
-        assertEquals(json.deserialize("\"2015-11-07T05:49:09+02\"", Date.class), cal.getTime());
-
-        cal.set(Calendar.MILLISECOND, 300);
-        assertEquals(json.deserialize("\"2015-11-07T03:49:09.3Z\"", Date.class), cal.getTime());
-
-        cal.set(Calendar.MILLISECOND, 356);
-        Date date = cal.getTime();
-
-        final String utcDate = "\"2015-11-07T03:49:09.356Z\"";
-        assertEquals(json.deserialize(utcDate, Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356+00:00\"", Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T05:49:09.356+02:00\"", Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T02:49:09.356-01:00\"", Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356Z\"", Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356+00\"", Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T02:49:09.356-0100\"", Date.class), date);
-        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356456789Z\"", Date.class), date);
-
-        assertEquals(utcDate, json.serialize(date));
-
-        // custom datetime format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
-        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
-        apiClient.setDateFormat(format);
-
-        String dateStr = "\"2015-11-07T13:49:09+10:00\"";
-        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09+00:00\"", Date.class)));
-        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", Date.class)));
-        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T00:49:09-03:00\"", Date.class)));
-
-        try {
-            // invalid time zone format
-            json.deserialize("\"2015-11-07T03:49:09+00\"", Date.class);
-            fail("json parsing should fail");
-        } catch (RuntimeException e) {
-            // OK
-        }
-        try {
-            // unexpected miliseconds
-            json.deserialize("\"2015-11-07T03:49:09.000Z\"", Date.class);
-            fail("json parsing should fail");
-        } catch (RuntimeException e) {
-            // OK
-        }
-
-    }
-
-    @Test
-    public void testOffsetDateTimeTypeAdapter() {
-        final String str = "\"2016-09-09T08:02:03.123-03:00\"";
-        OffsetDateTime date = OffsetDateTime.of(2016, 9, 9, 8, 2, 3, 123000000, ZoneOffset.of("-3"));
-
-        assertEquals(str, json.serialize(date));
-        //Use toString() instead of isEqual to verify that the offset is preserved
-        assertEquals(json.deserialize(str, OffsetDateTime.class).toString(), date.toString());
-    }
-
-    @Test
-    public void testLocalDateTypeAdapter() {
-        final String str = "\"2016-09-09\"";
-        final LocalDate date = LocalDate.of(2016, 9, 9);
-
-        assertEquals(str, json.serialize(date));
-        assertEquals(json.deserialize(str, LocalDate.class), date);
-    }
-
-
-    @Test
-    public void testDefaultDate() throws Exception {
-        final DateTimeFormatter datetimeFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
-        final String dateStr = "2015-11-07T14:11:05.267Z";
-        order.setShipDate(datetimeFormat.parse(dateStr, OffsetDateTime.FROM));
-
-        String str = json.serialize(order);
-        Type type = new TypeToken<Order>() { }.getType();
-        Order o = json.deserialize(str, type);
-        assertEquals(dateStr, datetimeFormat.format(o.getShipDate()));
-    }
-
-    @Test
-    public void testCustomDate() throws Exception {
-        final DateTimeFormatter datetimeFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
-        final String dateStr = "2015-11-07T14:11:05-02:00";
-        order.setShipDate(datetimeFormat.parse(dateStr, OffsetDateTime.FROM));
-
-        String str = json.serialize(order);
-        Type type = new TypeToken<Order>() { }.getType();
-        Order o = json.deserialize(str, type);
-        assertEquals(dateStr, datetimeFormat.format(o.getShipDate()));
-    }
-
-    @Test
-    public void testByteArrayTypeAdapterSerialization() {
-        // Arrange
-        final String expectedBytesAsString = "Let's pretend this a jpg or something";
-        final byte[] expectedBytes = expectedBytesAsString.getBytes(StandardCharsets.UTF_8);
-
-        // Act
-        String serializedBytesWithQuotes = json.serialize(expectedBytes);
-
-        // Assert
-        String serializedBytes = serializedBytesWithQuotes.substring(1, serializedBytesWithQuotes.length() - 1);
-        if (json.getGson().htmlSafe()) {
-            serializedBytes = serializedBytes.replaceAll("\\\\u003d", "=");
-        }
-        ByteString actualAsByteString = ByteString.decodeBase64(serializedBytes);
-        byte[] actualBytes = actualAsByteString.toByteArray();
-        assertEquals(expectedBytesAsString, new String(actualBytes, StandardCharsets.UTF_8));
-    }
-
-    @Test
-    public void testByteArrayTypeAdapterDeserialization() {
-        // Arrange
-        final String expectedBytesAsString = "Let's pretend this a jpg or something";
-        final byte[] expectedBytes = expectedBytesAsString.getBytes(StandardCharsets.UTF_8);
-        final ByteString expectedByteString = ByteString.of(expectedBytes);
-        final String serializedBytes = expectedByteString.base64();
-        final String serializedBytesWithQuotes = "\"" + serializedBytes + "\"";
-        Type type = new TypeToken<byte[]>() { }.getType();
-
-        // Act
-        byte[] actualDeserializedBytes = json.deserialize(serializedBytesWithQuotes, type);
-
-        // Assert
-        assertEquals(expectedBytesAsString, new String(actualDeserializedBytes, StandardCharsets.UTF_8));
-    }
-
-    // Obtained 22JAN2018 from stackoverflow answer by PuguaSoft https://stackoverflow.com/questions/11399491/java-timezone-offset
-    // Direct link https://stackoverflow.com/a/16680815/3166133
-    public static String getCurrentTimezoneOffset() {
-
-        TimeZone tz = TimeZone.getDefault();
-        Calendar cal = GregorianCalendar.getInstance(tz, Locale.ROOT);
-        int offsetInMillis = tz.getOffset(cal.getTimeInMillis());
-
-        String offset = String.format(Locale.ROOT,"%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
-        offset = (offsetInMillis >= 0 ? "+" : "-") + offset;
-
-        return offset;
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/ApiKeyAuthTest.java

@@ -1,76 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.openapitools.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class ApiKeyAuthTest {
-    @Test
-    public void testApplyToParamsInQuery() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
-
-        assertEquals(1, queryParams.size());
-        for (Pair queryParam : queryParams) {
-            assertEquals("my-api-key", queryParam.getValue());
-        }
-
-        // no changes to header parameters
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInQueryWithNullValue() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey(null);
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithPrefix() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithNullValue() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/auth/HttpBasicAuthTest.java

@@ -1,62 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.openapitools.client.Pair;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-
-public class HttpBasicAuthTest {
-    HttpBasicAuth auth = null;
-
-    @Before
-    public void setup() {
-        auth = new HttpBasicAuth();
-    }
-
-    @Test
-    public void testApplyToParams() {
-        List<Pair> queryParams = new ArrayList<Pair>();
-        Map<String, String> headerParams = new HashMap<String, String>();
-
-        auth.setUsername("my-username");
-        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
-        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username should be treated as empty string
-        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
-        expected = "Basic Om15LXBhc3N3b3Jk";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null password should be treated as empty string
-        auth.setUsername("my-username");
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
-        expected = "Basic bXktdXNlcm5hbWU6";
-        assertEquals(expected, headerParams.get("Authorization"));
-
-        // null username and password should be ignored
-        queryParams = new ArrayList<Pair>();
-        headerParams = new HashMap<String, String>();
-        auth.setUsername(null);
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
-        // no changes to parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(0, headerParams.size());
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/okhttp-gson/model/EnumValueTest.java

@@ -1,56 +0,0 @@
-package org.openapitools.client.model;
-
-import org.junit.Test;
-
-import com.google.gson.Gson;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class EnumValueTest {
-
-    @Test
-    public void testEnumClass() {
-        assertEquals(EnumClass._ABC.toString(), "_abc");
-        assertEquals(EnumClass._EFG.toString(), "-efg");
-        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
-    }
-
-    @Test
-    public void testEnumTest() {
-        // test enum value
-        EnumTest enumTest = new EnumTest();
-        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
-        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
-        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
-
-        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
-
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
-
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
-
-        // test serialization
-        Gson gson = new Gson();
-        String json = gson.toJson(enumTest);
-        assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":1,\"enum_number\":1.1}");
-
-        // test deserialization
-        EnumTest fromString = gson.fromJson(json, EnumTest.class);
-        assertEquals(fromString.getEnumString().toString(), "lower");
-        assertEquals(fromString.getEnumString().getValue(), "lower");
-        assertEquals(fromString.getEnumInteger().toString(), "1");
-        assertTrue(fromString.getEnumInteger().getValue() == 1);
-        assertEquals(fromString.getEnumNumber().toString(), "1.1");
-        assertTrue(fromString.getEnumNumber().getValue() == 1.1);
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java

@@ -1,254 +0,0 @@
-package org.openapitools.client;
-
-import org.openapitools.client.auth.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.junit.*;
-import org.springframework.http.MediaType;
-import org.springframework.util.MultiValueMap;
-
-import static org.junit.Assert.*;
-
-
-public class ApiClientTest {
-    ApiClient apiClient = null;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-    }
-
-    /**
-     *
-     */
-    @Test
-    public void testParseAndFormatDate() {
-        // default date format
-        String dateStr = "2015-11-07T03:49:09.356Z";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
-
-        // custom date format: without milli-seconds, custom time zone
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.ROOT);
-        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
-        apiClient.setDateFormat(format);
-        dateStr = "2015-11-07T13:49:09+10:00";
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
-        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
-    }
-
-    @Test
-    public void testIsJsonMime() {
-        assertFalse(apiClient.isJsonMime((String) null));
-        assertFalse(apiClient.isJsonMime(""));
-        assertFalse(apiClient.isJsonMime("text/plain"));
-        assertFalse(apiClient.isJsonMime("application/xml"));
-        assertFalse(apiClient.isJsonMime("application/jsonp"));
-        assertFalse(apiClient.isJsonMime("example/json"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
-        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
-
-        assertTrue(apiClient.isJsonMime("application/json"));
-        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
-
-        assertTrue(apiClient.isJsonMime("application/problem+json"));
-        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
-        assertTrue(apiClient.isJsonMime("application/json\t"));
-        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
-        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
-        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
-        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
-    }
-
-    @Test
-    public void testSelectHeaderAccept() {
-        String[] accepts = {"application/json", "application/xml"};
-        assertEquals(Arrays.asList(MediaType.parseMediaType("application/json")), apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
-        assertEquals(Arrays.asList(MediaType.parseMediaType("APPLICATION/JSON")), apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals(Arrays.asList(MediaType.parseMediaType("application/json; charset=UTF8")), apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{"text/plain", "application/xml"};
-        assertEquals(Arrays.asList(MediaType.parseMediaType("text/plain"),MediaType.parseMediaType("application/xml")), apiClient.selectHeaderAccept(accepts));
-
-        accepts = new String[]{};
-        assertNull(apiClient.selectHeaderAccept(accepts));
-    }
-
-    @Test
-    public void testSelectHeaderContentType() {
-        String[] contentTypes = {"application/json", "application/xml"};
-        assertEquals(MediaType.parseMediaType("application/json"), apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
-        assertEquals(MediaType.parseMediaType("APPLICATION/JSON"), apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
-        assertEquals(MediaType.parseMediaType("application/json; charset=UTF8"), apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{"text/plain", "application/xml"};
-        assertEquals(MediaType.parseMediaType("text/plain"), apiClient.selectHeaderContentType(contentTypes));
-
-        contentTypes = new String[]{};
-        assertEquals(MediaType.parseMediaType("application/json"), apiClient.selectHeaderContentType(contentTypes));
-    }
-
-    @Test
-    public void testGetAuthentications() {
-        Map<String, Authentication> auths = apiClient.getAuthentications();
-
-        Authentication auth = auths.get("api_key");
-        assertNotNull(auth);
-        assertTrue(auth instanceof ApiKeyAuth);
-        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
-        assertEquals("header", apiKeyAuth.getLocation());
-        assertEquals("api_key", apiKeyAuth.getParamName());
-
-        auth = auths.get("petstore_auth");
-        assertTrue(auth instanceof OAuth);
-        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
-
-        assertNull(auths.get("unknown"));
-
-        try {
-            auths.put("my_auth", new HttpBasicAuth());
-            fail("the authentications returned should not be modifiable");
-        } catch (UnsupportedOperationException e) {
-        }
-    }
-
-    @Ignore("There is no more basic auth in petstore security definitions")
-    @Test
-    public void testSetUsernameAndPassword() {
-        HttpBasicAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof HttpBasicAuth) {
-                auth = (HttpBasicAuth) _auth;
-                break;
-            }
-        }
-        auth.setUsername(null);
-        auth.setPassword(null);
-
-        apiClient.setUsername("my-username");
-        apiClient.setPassword("my-password");
-        assertEquals("my-username", auth.getUsername());
-        assertEquals("my-password", auth.getPassword());
-
-        // reset values
-        auth.setUsername(null);
-        auth.setPassword(null);
-    }
-
-    @Test
-    public void testSetApiKeyAndPrefix() {
-        ApiKeyAuth auth = null;
-        for (Authentication _auth : apiClient.getAuthentications().values()) {
-            if (_auth instanceof ApiKeyAuth) {
-                auth = (ApiKeyAuth) _auth;
-                break;
-            }
-        }
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-
-        apiClient.setApiKey("my-api-key");
-        apiClient.setApiKeyPrefix("Token");
-        assertEquals("my-api-key", auth.getApiKey());
-        assertEquals("Token", auth.getApiKeyPrefix());
-
-        // reset values
-        auth.setApiKey(null);
-        auth.setApiKeyPrefix(null);
-    }
-
-    @Test
-    public void testParameterToMultiValueMapWhenNameIsInvalid() throws Exception {
-        MultiValueMap<String, String> pairs_a = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, null, new Integer(1));
-        MultiValueMap<String, String> pairs_b = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "", new Integer(1));
-
-        assertTrue(pairs_a.isEmpty());
-        assertTrue(pairs_b.isEmpty());
-    }
-
-    @Test
-    public void testParameterToMultiValueMapWhenValueIsNull() throws Exception {
-        MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "param-a", null);
-
-        assertTrue(pairs.isEmpty());
-    }
-
-    @Test
-    public void testParameterToMultiValueMapWhenValueIsEmptyStrings() throws Exception {
-
-        // single empty string
-        MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "param-a", " ");
-        assertEquals(1, pairs.size());
-
-        // list of empty strings
-        List<String> strs = new ArrayList<String>();
-        strs.add(" ");
-        strs.add(" ");
-        strs.add(" ");
-
-        MultiValueMap<String, String> concatStrings = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "param-a", strs);
-
-        assertEquals(1, concatStrings.get("param-a").size());
-        assertFalse(concatStrings.get("param-a").isEmpty()); // should contain some delimiters
-    }
-
-    @Test
-    public void testParameterToMultiValueMapWhenValueIsNotCollection() throws Exception {
-        String name = "param-a";
-        Integer value = 1;
-
-        MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, name, value);
-
-        assertEquals(1, pairs.get(name).size());
-        assertEquals(value, Integer.valueOf(pairs.get(name).get(0)));
-    }
-
-    @Test
-    public void testParameterToMultiValueMapWhenValueIsCollection() throws Exception {
-        Map<ApiClient.CollectionFormat, String> collectionFormatMap = new HashMap<ApiClient.CollectionFormat, String>();
-        collectionFormatMap.put(ApiClient.CollectionFormat.CSV, ",");
-        collectionFormatMap.put(ApiClient.CollectionFormat.TSV, "\t");
-        collectionFormatMap.put(ApiClient.CollectionFormat.SSV, " ");
-        collectionFormatMap.put(ApiClient.CollectionFormat.PIPES, "\\|");
-        collectionFormatMap.put(null, ","); // no format, must default to csv
-
-        String name = "param-a";
-
-        List<Object> values = new ArrayList<Object>();
-        values.add("value-a");
-        values.add(123);
-        values.add(new Date());
-
-        // check for multi separately
-        MultiValueMap<String, String> multiValueMap = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.MULTI, name, values);
-        assertEquals(values.size(), multiValueMap.get(name).size());
-
-        // all other formats
-        for (ApiClient.CollectionFormat collectionFormat : collectionFormatMap.keySet()) {
-            MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(collectionFormat, name, values);
-
-            assertEquals(1, pairs.size());
-
-            String delimiter = collectionFormatMap.get(collectionFormat);
-            String[] pairValueSplit = pairs.get(name).get(0).split(delimiter);
-
-            assertEquals(values.size(), pairValueSplit.length);
-        }
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/ApiKeyAuthTest.java

@@ -1,47 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.junit.*;
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import static org.junit.Assert.*;
-
-public class ApiKeyAuthTest {
-    @Test
-    public void testApplyToParamsInQuery() {
-        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
-        HttpHeaders headerParams = new HttpHeaders();
-
-        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
-        auth.setApiKey("my-api-key");
-        auth.applyToParams(queryParams, headerParams);
-
-        assertEquals(1, queryParams.size());
-        assertEquals("my-api-key", queryParams.get("api_key").get(0));
-
-        // no changes to header parameters
-        assertEquals(0, headerParams.size());
-    }
-
-    @Test
-    public void testApplyToParamsInHeaderWithPrefix() {
-        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
-        HttpHeaders headerParams = new HttpHeaders();
-
-        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
-        auth.setApiKey("my-api-token");
-        auth.setApiKeyPrefix("Token");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN").get(0));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/resttemplate/auth/HttpBasicAuthTest.java

@@ -1,54 +0,0 @@
-package org.openapitools.client.auth;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.List;
-
-import org.junit.*;
-import org.springframework.http.HttpHeaders;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import static org.junit.Assert.*;
-
-public class HttpBasicAuthTest {
-    HttpBasicAuth auth = null;
-
-    @Before
-    public void setup() {
-        auth = new HttpBasicAuth();
-    }
-
-    @Test
-    public void testApplyToParams() {
-        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
-        HttpHeaders headerParams = new HttpHeaders();
-
-        auth.setUsername("my-username");
-        auth.setPassword("my-password");
-        auth.applyToParams(queryParams, headerParams);
-
-        // no changes to query parameters
-        assertEquals(0, queryParams.size());
-        assertEquals(1, headerParams.size());
-        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
-        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
-        assertEquals(expected, headerParams.get("Authorization").get(0));
-
-        // null username should be treated as empty string
-        auth.setUsername(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
-        expected = "Basic Om15LXBhc3N3b3Jk";
-        assertEquals(expected, headerParams.get("Authorization").get(1));
-
-        // null password should be treated as empty string
-        auth.setUsername("my-username");
-        auth.setPassword(null);
-        auth.applyToParams(queryParams, headerParams);
-        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
-        expected = "Basic bXktdXNlcm5hbWU6";
-        assertEquals(expected, headerParams.get("Authorization").get(2));
-    }
-}

CI/samples.ci/client/petstore/java/test-manual/resttemplate/model/EnumValueTest.java

@@ -1,63 +0,0 @@
-package org.openapitools.client.model;
-
-import org.junit.Test;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-public class EnumValueTest {
-
-    @Test
-    public void testEnumClass() {
-        assertEquals(EnumClass._ABC.toString(), "_abc");
-        assertEquals(EnumClass._EFG.toString(), "-efg");
-        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
-    }
-
-    @Test
-    public void testEnumTest() {
-        // test enum value
-        EnumTest enumTest = new EnumTest();
-        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
-        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
-        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
-
-        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
-        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
-
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
-        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
-        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
-
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
-        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
-        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
-
-        try {
-            // test serialization (object => json)
-            ObjectMapper mapper = new ObjectMapper();
-            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-            ObjectWriter ow = mapper.writer();
-            String json = ow.writeValueAsString(enumTest);
-            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
-
-            // test deserialization (json => object)
-            EnumTest fromString = mapper.readValue(json, EnumTest.class);
-            assertEquals(fromString.getEnumString().toString(), "lower");
-            assertEquals(fromString.getEnumInteger().toString(), "1");
-            assertEquals(fromString.getEnumNumber().toString(), "1.1");
-
-        } catch (Exception e) {
-            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
-        }
-    }
-}

CI/samples.ci/client/petstore/kotlin-string/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>KotlinPetstoreStringTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>kotlin-string</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>bundle-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>gradle</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/client/petstore/kotlin-threetenbp/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>KotlinPetstoreThreetenbpTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>kotlin-threetenbp</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>bundle-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>gradle</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-api-package-override/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-api-package-override</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-api-package-override Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-controller-only/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-controller-only</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-controller-only Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-fake-endpoints/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-fake-endpoints</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-fake-endpoints Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-no-bean-validation/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-no-bean-validation</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-no-bean-validation Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-no-exception-handling/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-no-exception-handling</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-no-exception-handling Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-no-interface/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-no-interface</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-no-interface Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-no-swagger-ui/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-no-swagger-ui</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-no-swagger-ui Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework-no-wrap-calls/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests-no-wrap-calls</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework-no-wrap-calls Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/java-play-framework/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>PlayServerTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>java-play-framework Project</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <executions>
-                    <execution>
-                        <id>Play Test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>sbt</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/samples.ci/server/petstore/kotlin-server/ktor/pom.xml

@@ -1,46 +0,0 @@
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>KotlinPetstoreKtorTests</artifactId>
-    <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
-    <name>kotlin-server-ktor</name>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>bundle-test</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>gradle</executable>
-                            <arguments>
-                                <argument>test</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

CI/settings.xml

@@ -1,36 +0,0 @@
-<settings>
-    <localRepository/>
-    <interactiveMode/>
-    <usePluginRegistry/>
-    <offline/>
-    <pluginGroups/>
-    <servers>
-        <server>
-            <id>sonatype-nexus-snapshots</id>
-            <username>${env.SONATYPE_USERNAME}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-        <server>
-            <id>ossrh</id>
-            <username>${env.SONATYPE_USERNAME}</username>
-            <password>${env.SONATYPE_PASSWORD}</password>
-        </server>
-    </servers>
-    <mirrors/>
-    <proxies/>
-    <profiles>
-        <profile>
-            <id>release</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <gpg.executable>gpg</gpg.executable>
-                <gpg.keyname>${env.SIGNING_KEY}</gpg.keyname>
-                <gpg.passphrase>${env.SIGNING_PASSPHRASE}</gpg.passphrase>
-                <gpg.secretKeyring>${env.TRAVIS_BUILD_DIR}/sec.gpg</gpg.secretKeyring>
-            </properties>
-        </profile>
-    </profiles>
-    <activeProfiles/>
-</settings>

CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@openapitools.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -2,16 +2,16 @@
 
 ## Before submitting an issue
 
- - If you're not using the latest master to generate API clients or server stubs, please give it another try by pulling the latest master as the issue may have already been addressed. Ref: [Getting Started](https://github.com/openapitools/openapi-generator#getting-started)
- - Search the [open issue](https://github.com/openapitools/openapi-generator/issues) and [closed issue](https://github.com/openapitools/openapi-generator/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
- - File an [issue ticket](https://github.com/openapitools/openapi-generator/issues/new) by providing all the required information.
+ - If you're not using the latest master to generate API clients or server stubs, please give it another try by pulling the latest master as the issue may have already been addressed. Ref: [Getting Started](https://github.com/swagger-api/swagger-codegen#getting-started)
+ - Search the [open issue](https://github.com/swagger-api/swagger-codegen/issues) and [closed issue](https://github.com/swagger-api/swagger-codegen/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
+ - File an [issue ticket](https://github.com/swagger-api/swagger-codegen/issues/new) by providing all the required information.
  - Test with the latest master by building the JAR locally to see if the issue has already been addressed.
  - You can also make a suggestion or ask a question by opening an "issue".
 
 ## Before submitting a PR
 
- - Search the [open issue](https://github.com/openapitools/openapi-generator/issues) to ensure no one else has reported something similar and no one is actively working on similar proposed change.
- - If no one has suggested something similar, open an ["issue"](https://github.com/openapitools/openapi-generator/issues) with your suggestion to gather feedback from the community.
+ - Search the [open issue](https://github.com/swagger-api/swagger-codegen/issues) to ensure no one else has reported something similar and no one is actively working on similar proposed change.
+ - If no one has suggested something similar, open an ["issue"](https://github.com/swagger-api/swagger-codegen/issues) with your suggestion to gather feedback from the community.
  - It's recommended to **create a new git branch** for the change so that the merge commit message looks nicer in the commit history.
 
 ## How to contribute
@@ -20,21 +20,17 @@
 
 If you're new to git, you may find the following FAQs useful:
 
-https://github.com/openapitools/openapi-generator/wiki/FAQ#git
-
-### Branches
-
-Please file the pull request against the correct branch, e.g. `master` for non-breaking changes. See the [Git Branches](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches) page for more information.
+https://github.com/swagger-api/swagger-codegen/wiki/FAQ#git
 
 ### Code generators
 
-All the code generators can be found in [modules/openapi-generator/src/main/java/org/openapitools/codegen/languages](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages)
+All the code generators can be found in [modules/swagger-codegen/src/main/java/io/swagger/codegen/languages](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages)
 
 ### Templates
 
-All the templates ([mustache](https://mustache.github.io/)) can be found in [modules/openapi-generator/src/main/resources](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/resources).
+All the templates ([mustache](https://mustache.github.io/)) can be found in [modules/swagger-codegen/src/main/resources](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/main/resources).
 
-For a list of variables available in the template, please refer to this [page](https://github.com/openapitools/openapi-generator/wiki/Mustache-Template-Variables)
+For a list of variables available in the template, please refer to this [page](https://github.com/swagger-api/swagger-codegen/wiki/Mustache-Template-Variables)
 
 
 ### Style guide
@@ -46,7 +42,6 @@ Code change should conform to the programming style guide of the respective lang
 - 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
-- Dart: https://www.dartlang.org/guides/language/effective-dart/style
 - Elixir: https://github.com/christopheradams/elixir_style_guide
 - Eiffel: https://www.eiffel.org/doc/eiffel/Coding%20Standards
 - Erlang: https://github.com/inaka/erlang_guidelines
@@ -75,19 +70,19 @@ You may find the current code base not 100% conform to the coding style and we w
 For [Vendor Extensions](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#vendorExtensions), please follow the naming convention below:
 - For general vendor extension, use lower case and hyphen. e.g. `x-is-unique`, `x-content-type`
 - For language-specified vendor extension, put it in the form of `x-{lang}-{extension-name}`. e.g. `x-objc-operation-id`, `x-java-feign-retry-limit`
-- For a list of existing vendor extensions in use, please refer to https://github.com/openapitools/openapi-generator/wiki/Vendor-Extensions. If you've added new vendor extensions as part of your PR, please update the wiki page.
+- For a list of existing vendor extensions in use, please refer to https://github.com/swagger-api/swagger-codegen/wiki/Vendor-Extensions. If you've added new vendor extensions as part of your PR, please update the wiki page.
 
 ### Testing
 
-To add test cases (optional) covering the change in the code generator, please refer to [modules/openapi-generator/src/test/java/org/openapitools/codegen](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/test/java/org/openapitools/codegen)
+To add test cases (optional) covering the change in the code generator, please refer to [modules/swagger-codegen/src/test/java/io/swagger/codegen](https://github.com/swagger-api/swagger-codegen/tree/master/modules/swagger-codegen/src/test/java/io/swagger/codegen)
 
 To test the templates, please perform the following:
-- Update the Petstore sample by running the shell script under `bin` folder. For example, run `./bin/ruby-petstore.sh` to update the Ruby PetStore API client under [`samples/client/petstore/ruby`](https://github.com/openapitools/openapi-generator/tree/master/samples/client/petstore/ruby) For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
+- Update the [Petstore](http://petstore.swagger.io/) sample by running the shell script under `bin` folder. For example, run `./bin/ruby-petstore.sh` to update the Ruby PetStore API client under [`samples/client/petstore/ruby`](https://github.com/swagger-api/swagger-codegen/tree/master/samples/client/petstore/ruby) For Windows, the batch files can be found under `bin\windows` folder. (If you find that there are new files generated or unexpected changes as a result of the update, that's not unusual as the test cases are added to the OpenAPI/Swagger spec from time to time. If you've questions or concerns, please open a ticket to start a discussion)
 - Run the tests in the sample folder, e.g. in `samples/client/petstore/ruby`, run `mvn integration-test -rf :RubyPetstoreClientTests`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests)
 - Finally, git commit the updated samples files: `git commit -a`
   (`git add -A` if added files with new test cases)
 
-To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all the required tools installed to run tests for different languages) or you can leverage http://travis-ci.org to run the CI tests by adding your own openapi-generator repository.
+To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all the required tools installed to run tests for different languages) or you can leverage http://travis-ci.org to run the CI tests by adding your own Swagger-Codegen repository.
 
 ### Tips
 - Smaller changes are easier to review
@@ -95,7 +90,7 @@ To start the CI tests, you can run `mvn verify -Psamples` (assuming you've all t
 - Add test case(s) to cover the change
 - Document the fix in the code to make the code more readable
 - Make sure test cases passed after the change (one way is to leverage https://travis-ci.org/ to run the CI tests)
-- File a PR with meaningful title, description and commit messages.
+- 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

@@ -3,26 +3,25 @@ FROM jimschubert/8-jdk-alpine-mvn:1.0
 RUN set -x && \
     apk add --no-cache bash
 
-ENV GEN_DIR /opt/openapi-generator
+ENV GEN_DIR /opt/swagger-codegen
 WORKDIR ${GEN_DIR}
 VOLUME  ${MAVEN_HOME}/.m2/repository
 
 # Required from a licensing standpoint
 COPY ./LICENSE ${GEN_DIR}
 
-# Required to compile openapi-generator
+# Required to compile swagger-codegen
 COPY ./google_checkstyle.xml ${GEN_DIR}
 
 # Modules are copied individually here to allow for caching of docker layers between major.minor versions
-COPY ./modules/openapi-generator-gradle-plugin ${GEN_DIR}/modules/openapi-generator-gradle-plugin
-COPY ./modules/openapi-generator-maven-plugin ${GEN_DIR}/modules/openapi-generator-maven-plugin
-COPY ./modules/openapi-generator-online ${GEN_DIR}/modules/openapi-generator-online
-COPY ./modules/openapi-generator-cli ${GEN_DIR}/modules/openapi-generator-cli
-COPY ./modules/openapi-generator ${GEN_DIR}/modules/openapi-generator
+# 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 openapi-generator-cli
-RUN mvn -am -pl "modules/openapi-generator-cli" package
+# 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/

LICENSE

@@ -1,202 +1,11 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+Copyright 2016 SmartBear Software
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
-   Copyright 2018 SmartBear Software
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

Vagrantfile

@@ -6,10 +6,10 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "ubuntu/bionic64"
+  config.vm.box = "ubuntu/trusty64"
 
   config.vm.provider "virtualbox" do |v|
-    v.name = "openapi-generator"
+    v.name = "swagger-codegen"
     v.memory = 2048
     v.cpus = 2
   end
@@ -23,15 +23,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   #Provision
   config.vm.provision "shell", inline: <<-SHELL
-    sudo apt-get update
-    sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    sudo add-apt-repository  "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-          $(lsb_release -cs) stable"
-    sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-cosmic main" > /etc/apt/sources.list.d/docker.list'
+    sudo touch /var/lib/cloud/instance/locale-check.skip
+    sudo apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+    sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list'
+    sudo apt-cache policy docker-engine
     sudo apt-get update
     sudo apt-get upgrade -y
-    sudo apt-get install -y docker-ce
+    sudo apt-get install -y docker-engine
     sudo usermod -aG docker vagrant
   SHELL
 

appveyor.yml

@@ -18,36 +18,30 @@ install:
   - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
-  - cmd: java -version
   - cmd: dir/w
+#  - cmd: RMDIR "C:\projects\swagger-codegen\swagger-samples" /S /Q
   - git clone https://github.com/wing328/swagger-samples
   - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
 build_script:
   # build C# API client
-  - nuget restore samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln
-  - msbuild samples\client\petstore\csharp\OpenAPIClient\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - nuget restore samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln
+  - msbuild samples\client\petstore\csharp\SwaggerClient\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # build C# API client (with PropertyChanged)
-  - nuget restore samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln
-  - msbuild samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - nuget restore samples\client\petstore\csharp\SwaggerClientWithPropertyChanged\IO.Swagger.sln
+  - msbuild samples\client\petstore\csharp\SwaggerClientWithPropertyChanged\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   # build C# .net standard 1.3+ API client
-  - nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
-  - msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-  # install openapi-generator locally
-  - mvn clean install --quiet
+  - nuget restore samples\client\petstore\csharp\SwaggerClientNetStandard\IO.Swagger.sln
+  - msbuild samples\client\petstore\csharp\SwaggerClientNetStandard\IO.Swagger.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  # install swagger codegen locally
+  - mvn clean install --batch-mode
 test_script:
-  # restore test-related files
-  - copy /b/v/y CI\samples.ci\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
   # test c# API client
-  - nunit-console samples\client\petstore\csharp\OpenAPIClient\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
+  - nunit-console samples\client\petstore\csharp\SwaggerClient\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor
   # test c# API client (with PropertyChanged)
-  - nunit-console samples\client\petstore\csharp\OpenAPIClientWithPropertyChanged\src\Org.OpenAPITools.Test\bin\Debug\Org.OpenAPITools.Test.dll --result=myresults.xml;format=AppVeyor
+  - nunit-console samples\client\petstore\csharp\SwaggerClientWithPropertyChanged\src\IO.Swagger.Test\bin\Debug\IO.Swagger.Test.dll --result=myresults.xml;format=AppVeyor
 
   # generate all petstore clients
   - .\bin\windows\run-all-petstore.cmd
-
-  # generate all petstore clients (openapi3)
-  - .\bin\openapi3\windows\run-all-petstore.cmd
-
-cache:
-  - C:\maven\
-  - C:\Users\appveyor\.m2
+#cache:
+#  - C:\maven\
+#  - C:\Users\appveyor\.m2

bin/ada-petstore.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,18 +17,18 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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"
-model="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
-ags="generate --template-dir modules/openapi-generator/src/main/resources/Ada -g ada $@"
-ags="$ags -i $model -t modules/openapi-generator/src/main/resources/Ada -o samples/client/petstore/ada"
+model="modules/swagger-codegen/src/test/resources/2_0/petstore.yaml"
+ags="$@ generate --template-dir modules/swagger-codegen/src/main/resources/Ada -l ada"
+ags="$ags -i $model -t modules/swagger-codegen/src/main/resources/Ada -o samples/client/petstore/ada"
 ags="$ags -DprojectName=Petstore --model-package Samples.Petstore"
 
 java $JAVA_OPTS -jar $executable $ags

bin/akka-scala-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+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 --artifact-id "scala-akka-petstore-client" -t modules/swagger-codegen/src/main/resources/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l akka-scala -o samples/client/petstore/akka-scala"
+
+java $JAVA_OPTS -jar $executable $ags

bin/android-petstore-httpclient.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/android -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android -Dlibrary=httpclient -o samples/client/petstore/android/httpclient $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/android -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l android -Dlibrary=httpclient -o samples/client/petstore/android/httpclient"
 
 java $JAVA_OPTS -jar $executable $ags

bin/android-petstore-volley.json

@@ -1,4 +1,4 @@
 {
     "library": "volley",
-    "artifactId": "petstore-android-volley"
+    "artifactId": "swagger-petstore-android-volley"
 }

bin/android-petstore-volley.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g android -c bin/android-petstore-volley.json -o samples/client/petstore/android/volley $@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l android -c bin/android-petstore-volley.json -o samples/client/petstore/android/volley"
 
 java $JAVA_OPTS -jar $executable $ags

bin/apache2-petstore-config.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -g apache2 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/config/petstore/apache2 $@"
+ags="$@ generate -l apache2 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/config/petstore/apache2"
 
 java $JAVA_OPTS -jar $executable $ags

bin/apex-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/apex -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g apex -o samples/client/petstore/apex $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/apex -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l apex -o samples/client/petstore/apex"
 
 java $JAVA_OPTS -jar $executable $ags

bin/aspnetcore-petstore-server.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -g aspnetcore -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5} $@"
+ags="$@ generate -l aspnetcore -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/aspnetcore --additional-properties packageGuid={3C799344-F285-4669-8FD5-7ED9B795D5C5}"
 
 java $JAVA_OPTS -jar $executable $ags

bin/bash-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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"
-args="generate -t modules/openapi-generator/src/main/resources/bash -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g bash -o samples/client/petstore/bash -c modules/openapi-generator/src/test/resources/2_0/bash-config.json --additional-properties hideGenerationTimestamp=true $@"
+args="$@ generate -t modules/swagger-codegen/src/main/resources/bash -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l bash -o samples/client/petstore/bash -c modules/swagger-codegen/src/test/resources/2_0/bash-config.json --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $args

bin/clojure-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore.json -g clojure -o samples/client/petstore/clojure $@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l clojure -o samples/client/petstore/clojure"
 
 java $JAVA_OPTS -jar $executable $ags

bin/cpp-pistache-server-petstore.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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 -g cpp-pistache-server -t modules/openapi-generator/src/main/resources/cpp-pistache-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml --additional-properties addExternalLibs=true -o samples/server/petstore/cpp-pistache $@"
-
-java $JAVA_OPTS -jar $executable $ags

bin/cpp-qt5-petstore.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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/cpp-qt5-client -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

bin/cpp-qt5-qhttpengine-server-petstore.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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/cpp-qt5-qhttpengine-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5-qhttpengine-server -o samples/server/petstore/cpp-qt5-qhttpengine-server $@"
-
-java $JAVA_OPTS -jar $executable $ags

bin/cpp-restbed-petstore-server.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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 -g cpp-restbed-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/cpp-restbed $@"
-
-java $JAVA_OPTS -jar $executable $ags

bin/cpp-restsdk-petstore.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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/cpp-rest-sdk-client -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

bin/cpp-tizen-petstore.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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/cpp-tizen-client -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

bin/cpprest-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+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/cpprest -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l cpprest -o samples/client/petstore/cpprest"
+
+java $JAVA_OPTS -jar $executable $ags

bin/csharp-dotnet2-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g csharp-dotnet2 -o samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient --additional-properties hideGenerationTimestamp=true $@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l csharp-dotnet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient --additional-properties hideGenerationTimestamp=true"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore-net-35.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClientNet35 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-35.json $@"
+ags="generate $@ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientNet35 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-35.json"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore-net-40.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClientNet40 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-40.json $@"
+ags="generate $@ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientNet40 --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-40.json"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore-net-standard.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClientNetStandard --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-standard.json $@"
+ags="generate $@ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientNetStandard --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} -c ./bin/csharp-petstore-net-standard.json"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore-netcore-project.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClientNetCoreProject --additional-properties packageGuid={67035b31-f8e5-41a4-9673-954035084f7d},netCoreProjectFile=true -c ./bin/csharp-petstore-net-standard.json $@"
+ags="generate $@ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientNetCoreProject --additional-properties packageGuid={67035b31-f8e5-41a4-9673-954035084f7d},netCoreProjectFile=true -c ./bin/csharp-petstore-net-standard.json"
 
 java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,20 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C} $@"
+ags="generate $@ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClient --additional-properties packageGuid={321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
 
 java $JAVA_OPTS -jar $executable $ags
-
-# restore csproj file
-echo "restore csproject file: CI/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj"
-cp ./CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj ./samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/
-

bin/csharp-property-changed-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged --additional-properties generatePropertyChanged=true --additional-properties packageGuid={5CD900DE-8266-412F-A758-28E1F9C623D5} $@"
+ags="generate $@ -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l csharp -o samples/client/petstore/csharp/SwaggerClientWithPropertyChanged --additional-properties generatePropertyChanged=true --additional-properties packageGuid={5CD900DE-8266-412F-A758-28E1F9C623D5}"
 
 java $JAVA_OPTS -jar $executable $ags

bin/cwiki-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cwiki -o samples/documentation/cwiki $@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l cwiki -o samples/documentation/cwiki"
 
 java $JAVA_OPTS -jar $executable $ags

bin/dart-flutter-petstore.sh

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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"
-
-## Generate non-browserClient
-#ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/swagger -DhideGenerationTimestamp=true -DbrowserClient=false $@"
-#
-## then options to generate the library for vm would be:
-##ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/swagger_vm -DbrowserClient=false -DpubName=swagger_vm $@"
-#java $JAVA_OPTS -jar $executable $ags
-#
-## Generate browserClient
-#ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/swagger-browser-client -DhideGenerationTimestamp=true -DbrowserClient=true $@"
-#java $JAVA_OPTS -jar $executable $ags
-
-# Generate non-browserClient and put it to the flutter sample app
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/flutter_petstore/swagger -DhideGenerationTimestamp=true -DbrowserClient=false $@"
-java $JAVA_OPTS -jar $executable $ags
-
-# There is a proposal to allow importing different libraries depending on the environment:
-# https://github.com/munificent/dep-interface-libraries
-# When this is implemented there will only be one library.
-
-# The current petstore test will then work for both: the browser library and the vm library.
-

bin/dart-jaguar-petstore.sh

@@ -1,42 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn clean package
-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"
-
-# Generate client
-ags="$@ generate -t modules/openapi-generator/src/main/resources/dart-jaguar -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l dart-jaguar -o samples/client/petstore/dart-jaguar/openapi -DhideGenerationTimestamp=true -DpubName=openapi"
-java $JAVA_OPTS -jar $executable $ags
-
-# Generate non-browserClient and put it to the flutter sample app
-ags="$@ generate -t modules/openapi-generator/src/main/resources/dart-jaguar -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l dart-jaguar -o samples/client/petstore/dart-jaguar/flutter_petstore/openapi -DhideGenerationTimestamp=true -DpubName=openapi"
-java $JAVA_OPTS -jar $executable $ags
-
-# There is a proposal to allow importing different libraries depending on the environment:
-# https://github.com/munificent/dep-interface-libraries
-# When this is implemented there will only be one library.
-
-# The current petstore test will then work for both: the browser library and the vm library.

bin/dart-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,29 +17,20 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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"
 
-# Generate non-browserClient
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/openapi -DhideGenerationTimestamp=true -DbrowserClient=false --additional-properties supportDart2=false $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/dart -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dart -o samples/client/petstore/dart/swagger -DhideGenerationTimestamp=true"
 
 # then options to generate the library for vm would be:
-#ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/openapi_vm -DbrowserClient=false -DpubName=openapi_vm --additional-properties supportDart2=false $@"
-java $JAVA_OPTS -jar $executable $ags
-
-# Generate browserClient
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/openapi-browser-client -DhideGenerationTimestamp=true -DbrowserClient=true --additional-properties supportDart2=false $@"
-java $JAVA_OPTS -jar $executable $ags
-
-# Generate non-browserClient and put it to the flutter sample app
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart/flutter_petstore/openapi -DhideGenerationTimestamp=true -DbrowserClient=false --additional-properties supportDart2=false $@"
+#ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dart -o samples/client/petstore/dart/swagger_vm -DbrowserClient=false -DpubName=swagger_vm"
 java $JAVA_OPTS -jar $executable $ags
 
 # There is a proposal to allow importing different libraries depending on the environment:
@@ -48,3 +38,4 @@ java $JAVA_OPTS -jar $executable $ags
 # When this is implemented there will only be one library.
 
 # The current petstore test will then work for both: the browser library and the vm library.
+

bin/dart2-petstore.sh

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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"
-
-# Generate non-browserClient
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart2/openapi -DhideGenerationTimestamp=true -DbrowserClient=false  $@"
-
-# then options to generate the library for vm would be:
-#ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart2/openapi_vm -DbrowserClient=false -DpubName=openapi_vm $@"
-java $JAVA_OPTS -jar $executable $ags
-
-# Generate browserClient
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart2/openapi-browser-client -DhideGenerationTimestamp=true -DbrowserClient=true  $@"
-java $JAVA_OPTS -jar $executable $ags
-
-# Generate non-browserClient and put it to the flutter sample app
-ags="generate -t modules/openapi-generator/src/main/resources/dart -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dart -o samples/client/petstore/dart2/flutter_petstore/openapi -DhideGenerationTimestamp=true -DbrowserClient=false  $@"
-java $JAVA_OPTS -jar $executable $ags
-
-# There is a proposal to allow importing different libraries depending on the environment:
-# https://github.com/munificent/dep-interface-libraries
-# When this is implemented there will only be one library.
-
-# The current petstore test will then work for both: the browser library and the vm library.

bin/dynamic-html.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g dynamic-html  -o samples/documentation/dynamic-html $@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dynamic-html  -o samples/dynamic-html"
 
 java $JAVA_OPTS -jar $executable $ags

bin/eiffel-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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"
-args="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g eiffel -o samples/client/petstore/eiffel/ $@"
+args="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l eiffel -o samples/client/petstore/eiffel/"
 
 java $JAVA_OPTS -jar $executable $args

bin/elixir-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,11 +17,11 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 fi
 
 # remove existing lib and model file
@@ -32,6 +31,6 @@ rm -Rf "samples/client/petstore/elixir/lib/swagger_petstore/lib/"
 
 # 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"
-args="generate -t modules/openapi-generator/src/main/resources/elixir -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g elixir -o samples/client/petstore/elixir/ --additional-properties invokerPackage=OpenapiPetstore $@"
+args="$@ generate -t modules/swagger-codegen/src/main/resources/elixir -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l elixir -o samples/client/petstore/elixir"
 
 java $JAVA_OPTS -jar $executable $args

bin/elm-0.18-petstore.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/client/petstore/elm-0.18 --additional-properties elmVersion=0.18 $@"
-
-java $JAVA_OPTS -jar $executable $ags

bin/elm-petstore-all.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./bin/elm-0.18-petstore.sh
-./bin/elm-petstore.sh
-

bin/elm-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/client/petstore/elm $@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l elm -o samples/client/petstore/elm"
 
 java $JAVA_OPTS -jar $executable $ags

bin/erlang-petstore-client.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/erlang-client -DpackageName=petstore -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g erlang-client -o samples/client/petstore/erlang-client $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/erlang-client -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l erlang-client -o samples/client/petstore/erlang-client"
 
 java $JAVA_OPTS -jar $executable $ags

bin/erlang-petstore-server.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/erlang-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g erlang-server -o samples/server/petstore/erlang-server $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/erlang-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l erlang-server -o samples/server/petstore/erlang-server"
 
 java $JAVA_OPTS -jar $executable $ags

bin/finch-petstore-server.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/finch -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g scala-finch -o samples/server/petstore/finch $@"
+ags="generate $@ -t modules/swagger-codegen/src/main/resources/finch -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l finch -o samples/server/petstore/finch"
 
 java $JAVA_OPTS -jar $executable $ags

bin/flash-petstore.json

@@ -1,4 +0,0 @@
-{
-    "packageName": "org.openapitools",
-    "invokerPackage": "org.openapitools"
-}

bin/flash-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/flash -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g flash -o samples/client/petstore/flash -c bin/flash-petstore.json $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/flash -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l flash -o samples/client/petstore/flash"
 
 java $JAVA_OPTS -jar $executable $ags

bin/go-gin-petstore-server.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-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/go-gin-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g go-gin-server -o samples/server/petstore/go-gin-api-server -DpackageName=petstoreserver  --additional-properties hideGenerationTimestamp=true -Dservice $@"
-
-java $JAVA_OPTS -jar $executable $ags
-#!/usr/bin/env bash

bin/go-petstore-server.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,16 +17,16 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 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/go-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g go-server -o samples/server/petstore/go-api-server -DpackageName=petstoreserver  --additional-properties hideGenerationTimestamp=true -Dservice $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/go-server -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l go-server -o samples/server/petstore/go-api-server -DpackageName=petstoreserver  --additional-properties hideGenerationTimestamp=true -Dservice"
 
 java $JAVA_OPTS -jar $executable $ags

bin/go-petstore-withxml.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
-
-if [ ! -f "$executable" ]
-then
-  mvn -B clean package
-fi
-
-echo "Removing files and folders under samples/client/petstore/go/go-petstore-withXml"
-rm -rf samples/client/petstore/go/go-petstore-withXml
-
-# 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/go -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g go -o samples/client/petstore/go/go-petstore-withXml -DpackageName=petstore,withXml=true,withGoCodegenComment=true $@"
-
-java $JAVA_OPTS -jar $executable $ags

bin/go-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-echo "# START SCRIPT: $SCRIPT"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,18 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  mvn clean package
 fi
 
-echo "Removing files and folders under samples/client/petstore/go/go-petstore"
-rm -rf samples/client/petstore/go/go-petstore
-
 # 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/go -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g go -o samples/client/petstore/go/go-petstore -DpackageName=petstore $@"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/go -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l go -o samples/client/petstore/go/go-petstore -DpackageName=petstore "
 
 java $JAVA_OPTS -jar $executable $ags