diff --git a/.circleci/config.yml b/.circleci/config.yml
index 711e19ff57f..22f05c19a5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,8 +39,8 @@ commands: # a reusable command with parameters
command: |-
printf '127.0.0.1 petstore.swagger.io
' | sudo tee -a /etc/hosts
- # - run: docker pull openapitools/openapi-petstore
- # - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
+ # - run: docker pull openapijsonschematools/openapi-petstore
+ # - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapijsonschematools/openapi-petstore
- run: docker pull swaggerapi/petstore
- run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
- run: docker ps -a
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 416f9199ba2..0c7322028fc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,12 @@
## Core team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/config/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/**/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/serializer/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/**/*.java @OpenAPITools/generator-core-team
-modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/**/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/auth/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/config/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/examples/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/ignore/**/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/serializer/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/templating/**/*.java @OpenAPITools/generator-core-team
+modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/utils/**/*.java @OpenAPITools/generator-core-team
modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team
# No need for auto-generated subdirectories (reduces noise)
@@ -29,7 +29,7 @@ modules/openapi-generator-gradle-plugin/**/* @jimschubert
modules/openapi-generator-maven-plugin/**/* @jimschubert
# Martin Delille
-/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java @martindelille
-/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @martindelille
+/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/CppQtClientCodegen.java @martindelille
+/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/CppQtAbstractCodegen.java @martindelille
/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/resources/cpp-qt-client @martindelille
/Users/martin/dev/clone/openapi-generator/samples/client/petstore/cpp-qt @martindelille
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5c7bdfdce01..b15dfa48107 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -37,7 +37,7 @@ link it here.
##### Related issues/PRs
-
+
##### Suggest a fix/enhancement
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9a5ab2f6d90..c802fbdb8d0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -59,7 +59,7 @@ link it here.
##### Related issues/PRs
-
+
##### Suggest a fix
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index cf673ad47c0..b811df27a89 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
### PR checklist
-- [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-json-schema-generator/blob/master/CONTRIBUTING.md).
+- [ ] Read the [contribution guidelines](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/CONTRIBUTING.md).
- [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
- [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-json-schema-generator#14---build-projects) and update samples:
```
diff --git a/.github/workflows/openapi-generator.yaml b/.github/workflows/openapi-generator.yaml
index e7053340e0a..bb4a6afb8a1 100644
--- a/.github/workflows/openapi-generator.yaml
+++ b/.github/workflows/openapi-generator.yaml
@@ -30,7 +30,7 @@ jobs:
~/.m2/repository
~/.gradle
!~/.gradle/caches/*/plugin-resolution/
- !~/.m2/repository/org/openapitools/
+ !~/.m2/repository/org/openapijsonschematools/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
@@ -66,7 +66,7 @@ jobs:
~/.m2/repository
~/.gradle
!~/.gradle/caches/*/plugin-resolution/
- !~/.m2/repository/org/openapitools/
+ !~/.m2/repository/org/openapijsonschematools/
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
@@ -175,7 +175,7 @@ jobs:
~/.m2/repository
~/.gradle
!~/.gradle/caches/*/plugin-resolution/
- !~/.m2/repository/org/openapitools/
+ !~/.m2/repository/org/openapijsonschematools/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-test-maven-plugin-${{ env.cache-name }}-
@@ -209,7 +209,7 @@ jobs:
~/.gradle
!~/.gradle/caches/modules-2/modules-2.lock
!~/.gradle/caches/*/plugin-resolution/
- !~/.m2/repository/org/openapitools/
+ !~/.m2/repository/org/openapijsonschematools/
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-test-gradle-plugin-${{ env.cache-name }}-
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 4df69baebf7..86cd301419e 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -23,4 +23,4 @@ jobs:
- name: Jacoco Aggregate
run: mvn jacoco:report-aggregate
- name: Publish to Sonar
- run: mvn -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapitools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}
+ run: mvn -B -q -nsu sonar:sonar -Dsonar.projectKey=OpenAPITools_openapi-generator -Dsonar.organization=openapijsonschematools -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_LOGIN }} -Dsonar.branch.name=${GITHUB_REF##*/}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index aa1007f065b..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,239 +0,0 @@
-sudo: required
-language: java
-jdk:
- - openjdk8
-
-# See https://docs.travis-ci.com/user/languages/java/#caching
-before_cache:
- - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
- # Avoid caching our built dependencies between runs.
- - rm -fr $HOME/.m2/repository/org/openapitools/
-
-cache:
- yarn: true
- directories:
- - $HOME/.m2
- - $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/python/.venv/
- - $HOME/samples/server/petstore/rust-server/target
- - $HOME/perl5
- - $HOME/.cargo
- - $HOME/.pub-cache
- - $HOME/samples/server/petstore/cpp-pistache/pistache
- - $HOME/.rvm/gems/ruby-2.4.1
- - $HOME/website/node_modules/
- - $HOME/.cache/deno
- - $HOME/.phpenv/versions/8.1.4
-
-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:
- - sudo rm -rf /var/lib/apt/lists/*
- - 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) edge"
- - sudo apt-get update
- - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
- - mkdir -vp ~/.docker/cli-plugins/
- - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
- - chmod a+x ~/.docker/cli-plugins/docker-buildx
- # to run petstore server locally via docker
- - echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin || true
- - docker pull swaggerapi/petstore
- - docker run -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
- - docker ps -a
- # comment out crystal installation as the tests will run on circleci or github action instead
- # install crystal
- #- echo 'deb http://download.opensuse.org/repositories/devel:/languages:/crystal/xUbuntu_16.04/ /' | sudo tee /etc/apt/sources.list.d/devel:languages:crystal.list
- #- curl -fsSL https://download.opensuse.org/repositories/devel:languages:crystal/xUbuntu_16.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_languages_crystal.gpg > /dev/null
- #- sudo apt update
- #- sudo apt install crystal
- #- crystal --version
- - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.22.0
- - export PATH="$HOME/.yarn/bin:$PATH"
- # install rust
- - curl https://sh.rustup.rs -sSf | sh -s -- -y -v
- # required when sudo: required for the Ruby petstore tests
- - gem install bundler
- # set python 3.6.3 as default
- - source ~/virtualenv/python3.6/bin/activate
- # -- skip bash test to shorten build time
- # Add bats test framework and cURL for Bash script integration tests
- #- sudo add-apt-repository ppa:duggan/bats --yes
- #- sudo apt-get update -qq
- #- sudo apt-get install -qq bats
- #- sudo apt-get install -qq curl
- # -- skip bash test end
- # 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
- # switch to php7
- - sudo apt-get install libonig-dev libzip-dev
- - git clone https://github.com/php-build/php-build $(phpenv root)/plugins/php-build
- - git clone https://github.com/ngyuki/phpenv-composer.git $(phpenv root)/plugins/phpenv-composer
- - if [ $(ls -A "$HOME/.phpenv/versions/8.1.4" | wc -l) -eq 0 ]; then
- phpenv install 8.1.4;
- fi;
- - phpenv rehash
- - phpenv versions
- #- phpenv global 7.2.15
- - phpenv global 8.1.4
- - php -v
- # comment out below as installation failed in travis
- # Add rebar3 build tool and recent Erlang/OTP for Erlang petstore server tests.
- # - Travis CI does not support rebar3 [yet](https://github.com/travis-ci/travis-ci/issues/6506#issuecomment-275189490).
- # - Rely on `kerl` for [pre-compiled versions available](https://docs.travis-ci.com/user/languages/erlang#Choosing-OTP-releases-to-test-against). Rely on installation path chosen by [`travis-erlang-builder`](https://github.com/travis-ci/travis-erlang-builder/blob/e6d016b1a91ca7ecac5a5a46395bde917ea13d36/bin/compile#L18).
- # - . ~/otp/18.2.1/activate && erl -version
- #- curl -f -L -o ./rebar3 https://s3.amazonaws.com/rebar3/rebar3 && chmod +x ./rebar3 && ./rebar3 version && export PATH="${TRAVIS_BUILD_DIR}:$PATH"
- # install C++ tools
- - sudo apt install -y --no-install-recommends valgrind cmake build-essential
- - cmake --version
- # install Qt5
- #- sudo apt install -y --no-install-recommends qt5-default
- # install boost
- - sudo apt install -y --no-install-recommends libboost-all-dev
- # perl dep
- - cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
- - cpanm --quiet --no-interactive Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON || echo "Ignored failure from cpanm"
- # show host table to confirm petstore.swagger.io is mapped to localhost
- - 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;
- - pushd .; cd website; yarn install; popd
- # install Deno
- - sh -s v1.6.2 < ./CI/deno_install.sh
- - export PATH="$HOME/.deno/bin:$PATH"
-
-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
-
-script:
- # fail fast
- - set -e
- # show docker buildx version
- - docker buildx version
- # fail if the template files contains tabs
- - /bin/bash ./bin/utils/detect_tab_in_templates.sh
- # fail if the test files have changes
- - bin/utils/detect_test_file_changes.rb bin/utils/test_file_list.yaml
- # fail if templates/generators contain carriage return '\r'
- - /bin/bash ./bin/utils/detect_carriage_return.sh
- # fail if generators contain merge conflicts
- - /bin/bash ./bin/utils/detect_merge_conflict.sh
- # fail if generators contain tab '\t'
- - /bin/bash ./bin/utils/detect_tab_in_java_class.sh
- # run integration tests defined in maven pom.xml
- # WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
- - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
- - mvn -e --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-after_success:
- # push to maven repo
- - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
- if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ]; then
- echo "Publishing from branch $TRAVIS_BRANCH";
- 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}" publishMavenJavaPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
- echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
- popd;
- elif [ -z $TRAVIS_TAG ] && [[ "$TRAVIS_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]]; then
- echo "Publishing from branch $TRAVIS_BRANCH";
- 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}" publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository --no-daemon;
- echo "Finished ./gradlew publishPluginMavenPublicationToNexusRepository closeAndReleaseRepository";
- popd;
- fi;
- if [ -n $TRAVIS_TAG ] && [[ "$TRAVIS_TAG" =~ ^[v][0-9]+\.[0-9]+\.[0-9]+$ ]]; then
- echo "Publishing the gradle plugin to Gradle Portal on tag $TRAVIS_TAG (only)";
- pushd .;
- cd modules/openapi-generator-gradle-plugin;
- ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" publishPlugins -Dgradle.publish.key=$GRADLE_PUBLISH_KEY -Dgradle.publish.secret=$GRADLE_PUBLISH_SECRET --no-daemon;
- echo "Finished ./gradlew publishPlugins (plugin portal)";
- 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;
- export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
- export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
- docker buildx create --use;
- if [ ! -z "$TRAVIS_TAG" ]; then
- docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME:latest -t $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_GENERATOR_IMAGE_NAME -t $DOCKER_GENERATOR_IMAGE_NAME:latest-release ./modules/openapi-generator-online;
- echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
- fi;
- if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
- docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
- echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME for master";
- 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;
- cp docker-entrypoint.sh ./modules/openapi-generator-cli;
- export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
- export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
- docker buildx create --use;
- docker buildx build --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
- if [ ! -z "$TRAVIS_TAG" ]; then
- docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG -t $DOCKER_CODEGEN_CLI_IMAGE_NAME -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest-release ./modules/openapi-generator-cli;
- echo "Built and tagged $DOCKER_GENERATOR_IMAGE_NAME";
- fi;
- if [ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
- docker buildx build --push --platform linux/amd64,linux/arm64 --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
- echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
- fi;
- fi;
- ## publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
- - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
- cd website;
- git config --global user.name "${GH_NAME}";
- git config --global user.email "${GH_EMAIL}";
- echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
- yarn install;
- GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
- 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
-
diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh
index 716ed76214f..2e611bddece 100755
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -70,6 +70,7 @@ elif [ "$NODE_INDEX" = "4" ]; then
(cd samples/openapi3/client/petstore/python && make test)
(cd samples/openapi3/client/3_0_3_unit_test/python && make test)
(cd samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python && make test)
+ (cd samples/openapi3/client/features/security/python && make test)
else
echo "Running node $NODE_INDEX"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index b417192acb3..b9d420dd41d 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
## 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.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@openapijsonschematools.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.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a1c8ee7fe57..e0c94b2c25d 100644
--- a/CONTRIBUTING.md
+++ b/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. Failure to provide enough detail may result in slow response from the community.
+ - 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/openapi-json-schema-tools/openapi-json-schema-generator#getting-started)
+ - Search the [open issue](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues) and [closed issue](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
+ - File an [issue ticket](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues/new) by providing all the required information. Failure to provide enough detail may result in slow response from the community.
- 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/openapi-json-schema-tools/openapi-json-schema-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/openapi-json-schema-tools/openapi-json-schema-generator/issues) with your suggestion to gather feedback from the community.
- If you're adding a new option to a generator, please consider using the `-t` option with customized templates instead or start a discussion first by opening an issue as we want to avoid adding too many options to the generator.
- It's recommended to **create a new git branch** for the change so that the merge commit message looks nicer in the commit history.
@@ -21,7 +21,7 @@
If you're new to git, you may find the following FAQs useful:
-https://github.com/openapitools/openapi-generator/wiki/FAQ#git
+https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/wiki/FAQ#git
### Branches
@@ -29,15 +29,15 @@ Please file the pull request against the correct branch, e.g. `master` for non-b
### 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/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages)
If you want to add a new generator, follow the [new-generator](https://openapi-generator.tech/docs/new-generator) guide.
### 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/openapi-generator/src/main/resources](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/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/openapi-json-schema-tools/openapi-json-schema-generator/wiki/Mustache-Template-Variables)
### Style guide
@@ -80,15 +80,15 @@ 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/openapi-json-schema-tools/openapi-json-schema-generator/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/openapi-generator/src/test/java/org/openapijsonschematools/codegen](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/src/test/java/org/openapijsonschematools/codegen)
To test the templates, please perform the following:
-- Update the Petstore sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh ./bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (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 sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh ./bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (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)
- During development, it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `-t modules/openapi-generator/src/main/resources/python`.
- Run the tests in the sample folder using maven `mvn integration-test -f /path/to/pom.xml`, e.g. `mvn integration-test -f samples/client/petstore/python/pom.xml`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests). __Please notice:__ you must run a local instance of the Petstore server in order to perform the tests, as running them against petstore.swagger.io is not supported anymore. Please refer to item 3 of [Integration Tests - How to add integration tests for new Petstore samples](https://github.com/OpenAPITools/openapi-generator/wiki/Integration-Tests#how-to-add-integration-tests-for-new-petstore-samples) to learn how to quickly configure and run it.
- Finally, git commit the updated samples files: `git commit -a` (`git add -A` if added files with new test cases)
diff --git a/Dockerfile b/Dockerfile
index 94a11131cf2..9cb61b342ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,6 @@ COPY ./LICENSE ${GEN_DIR}
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-json-schema-generator-online ${GEN_DIR}/modules/openapi-json-schema-generator-online
COPY ./modules/openapi-json-schema-generator-cli ${GEN_DIR}/modules/openapi-json-schema-generator-cli
COPY ./modules/openapi-json-schema-generator-core ${GEN_DIR}/modules/openapi-json-schema-generator-core
COPY ./modules/openapi-json-schema-generator ${GEN_DIR}/modules/openapi-json-schema-generator
diff --git a/README.md b/README.md
index 5fda81a28df..15a37d08030 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,10 @@
-
-
-:star::star::star: If you would like to contribute, please refer to [guidelines](CONTRIBUTING.md) and a list of [open tasks](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).:star::star::star:
-
-:warning: If the OpenAPI spec, templates or any input (e.g. options, environment variables) is obtained from an untrusted source or environment, please make sure you've reviewed these inputs before using OpenAPI JSON Schema Generator to generate the API client, server stub or documentation to avoid potential security issues (e.g. [code injection](https://en.wikipedia.org/wiki/Code_injection)). For security vulnerabilities, please contact create an issue. :warning:
-
-:bangbang: Both "openapi-json-schema-tools" (the parent organization of OpenAPI JSON Schema Generator) and "OpenAPI JSON Schema Generator" are not affiliated with OpenAPI Initiative (OAI) :bangbang:
-
-
+Auto generate a client sdk from your openapi 3.0.0-3.0.3 document using Openapi JSON Schema Generator.
+This project is a code generator that focuses on supporting all openapi and json schema features.
## Overview
OpenAPI JSON Schema Generator allows auto-generation of API client libraries (SDK generation) given an
@@ -41,14 +31,16 @@ Currently, the following languages/frameworks are supported:
- accessing properties in object instances so some_val in some_val = some_inst['someKey'] will have the correct type hint
- accessing array items in array instances so some_val in some_val = array_inst[0] will have the correct type hint
- endpoint inputs + responses
+- Code re-use built in from the ground up
+ - components/schemas/headers etc are generated as separate classes and imported when used via $ref
+- Openapi spec inline schemas supported at any depth in any location
- Format support for: int32, int64, float, double, binary, date, datetime, uuid
- Invalid (in python) property names supported like `from`, `1var`, `hi-there` etc in
- schema property names
- endpoint parameter names
-- Openapi spec inline schemas supported at any depth
- If needed, validation of some json schema keywords can be deactivated via a configuration class
- Payload values are not coerced when validated, so a datetime value can pass other validations that describe the payload only as type string
-- String transmission of numbers supported with type: string, format: number, value can be accessed as a Decimal with inst.as_decimal_oapg
+- String transmission of numbers supported with type: string, format: number, value can be accessed as a Decimal with inst.as_decimal_
- Multiple content types supported for request and response bodies
- Endpoint response always also includes the urllib3.HTTPResponse
- Endpoint response deserialization can be skipped with the skip_deserialization argument
@@ -63,10 +55,8 @@ And many more!
### Can I build here?
-Yes! Contributions are welcome.
-If you want to build a new server or client or documentation generator you are welcome to here.
-Can I write a python generator based on the pydantic or jsonschema libraries?
-Definitely!
+Yes; contributions are welcome!
+Submit a PR if you want to add a new server scaffold, client sdk, or documentation generator in any language.
## Table of contents
@@ -81,8 +71,7 @@ Definitely!
- [3 - Usage](#3---usage)
- [3.1 - Customization](#31---customization)
- [3.2 - Workflow Integration](#32---workflow-integration-maven-gradle-github-cicd)
- - [3.3 - Online Generators](#33---online-openapi-json-schema-generator)
- - [3.4 - License Information on Generated Code](#34---license-information-on-generated-code)
+ - [3.3 - License Information on Generated Code](#34---license-information-on-generated-code)
- [4 - Companies/Projects using OpenAPI JSON Schema Generator](#4---companiesprojects-using-openapi-json-schema-generator)
- [5 - About Us](#5---about-us)
- [5.1 - History of OpenAPI JSON Schema Generator](#51---history-of-openapi-json-schema-generator)
@@ -96,6 +85,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
| OpenAPI JSON Schema Generator Version | OpenAPI Spec compatibility |
|---------------------------------------|-----------------------------|
+| 2.0.0 | 3.0.0 - 3.0.3 |
| 1.0.4 | 3.0.0 - 3.0.3 |
| 1.0.3 | 3.0.0 - 3.0.3 |
| 1.0.2 | 3.0.0 - 3.0.3 |
@@ -150,39 +140,6 @@ docker run --rm -v "${PWD}:/local" openapjsonschematools/openapi-json-schema-gen
The generated code will be located under `./out/python` in the current directory.
-#### OpenAPI JSON Schema Generator Online Docker Image
-
-The openapi-json-schema-generator-online image can act as a self-hosted web application and API for generating code. This container can be incorporated into a CI pipeline, and requires at least two HTTP requests and some docker orchestration to access generated code.
-
-Example usage:
-
-```sh
-# Start container at port 8888 and save the container id
-> CID=$(docker run -d -p 8888:8080 openapitools/openapi-json-schema-generator-online)
-
-# allow for startup
-> sleep 10
-
-# Get the IP of the running container (optional)
-GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}' $CID)
-
-# Execute an HTTP request to generate a Ruby client
-> curl -X POST --header 'Content-Type: application/json' --header 'Accept: application/json' \
--d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-json-schema-generator/master/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml"}' \
-'http://localhost:8888/api/gen/clients/python'
-
-{"code":"c2d483.3.4672-40e9-91df-b9ffd18d22b8","link":"http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8"}
-
-# Download the generated zip file
-> wget http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8
-
-# Unzip the file
-> unzip c2d483.3.4672-40e9-91df-b9ffd18d22b8
-
-# Shutdown the openapi generator image
-> docker stop $CID && docker rm $CID
-```
-
#### Development in docker
You can use `run-in-docker.sh` to do all development. This script maps your local repository to `/gen`
@@ -249,7 +206,7 @@ java -jar modules/openapi-json-schema-generator-cli/target/openapi-json-schema-g
(if you're on Windows, replace the last command with `java -jar modules\openapi-json-schema-generator-cli\target\openapi-json-schema-generator-cli.jar generate -i https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml -g python -o c:\temp\python_api_client`)
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-json-schema-generator-cli/6.1.0/openapi-json-schema-generator-cli-6.1.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapijsonschematools/openapi-json-schema-generator-cli/6.1.0/openapi-json-schema-generator-cli-6.1.0.jar)
To get a list of **general** options available, please run `java -jar modules/openapi-json-schema-generator-cli/target/openapi-json-schema-generator-cli.jar help generate`
@@ -259,7 +216,7 @@ To get a list of PHP specified options (which can be passed to the generator wit
## [3 - Usage](#table-of-contents)
### To generate a sample client library
-You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapitools/openapi-json-schema-generator/master/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml) as follows:
+You can build a client against the [Petstore API](https://raw.githubusercontent.com/openapijsonschematools/openapi-json-schema-generator/master/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml) as follows:
```sh
./bin/generate-samples.sh ./bin/configs/python.yaml
@@ -271,7 +228,7 @@ This script will run the generator with this command:
```sh
java -jar modules/openapi-json-schema-generator-cli/target/openapi-json-schema-generator-cli.jar generate \
- -i https://raw.githubusercontent.com/openapitools/openapi-json-schema-generator/master/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml \
+ -i https://raw.githubusercontent.com/openapijsonschematools/openapi-json-schema-generator/master/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml \
-g python \
-t modules/openapi-json-schema-generator/src/main/resources/python \
--additional-properties packageName=petstore_api \
@@ -345,11 +302,7 @@ Please refer to [customization.md](docs/customization.md) on how to customize th
Please refer to [integration.md](docs/integration.md) on how to integrate OpenAPI generator with Maven, Gradle, Github and CI/CD.
-### [3.3 - Online OpenAPI generator](#table-of-contents)
-
-Please refer to [online.md](docs/online.md) on how to run and use the `openapi-json-schema-generator-online` - a web service for `openapi-json-schema-generator`.
-
-### [3.4 - License information on Generated Code](#table-of-contents)
+### [3.3 - License information on Generated Code](#table-of-contents)
The OpenAPI JSON Schema Generator project is intended as a benefit for users of the Open API Specification. The project itself has the [License](#license) as specified. In addition, please understand the following points:
diff --git a/bin/configs/python.yaml b/bin/configs/python.yaml
index 12a23163bd6..4412061bc5e 100644
--- a/bin/configs/python.yaml
+++ b/bin/configs/python.yaml
@@ -1,6 +1,6 @@
generatorName: python
outputDir: samples/openapi3/client/petstore/python
-inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore_customized.yaml
templateDir: modules/openapi-json-schema-generator/src/main/resources/python
additionalProperties:
packageName: petstore_api
diff --git a/bin/configs/python_security.yaml b/bin/configs/python_security.yaml
new file mode 100644
index 00000000000..dc27f965fe8
--- /dev/null
+++ b/bin/configs/python_security.yaml
@@ -0,0 +1,5 @@
+generatorName: python
+outputDir: samples/openapi3/client/features/security/python
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/security.yaml
+additionalProperties:
+ packageName: this_package
diff --git a/bin/configs/unmaintained/ada.yaml b/bin/configs/unmaintained/ada.yaml
index c67b9b7d3f0..8dd8df8a3e4 100644
--- a/bin/configs/unmaintained/ada.yaml
+++ b/bin/configs/unmaintained/ada.yaml
@@ -1,7 +1,7 @@
generatorName: ada
outputDir: samples/client/petstore/ada
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Ada
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Ada
additionalProperties:
modelPackage: Samples.Petstore
projectName: Petstore
diff --git a/bin/configs/unmaintained/android-httpclient.yaml b/bin/configs/unmaintained/android-httpclient.yaml
index 7a58659d0e3..2a7cba0a8bb 100644
--- a/bin/configs/unmaintained/android-httpclient.yaml
+++ b/bin/configs/unmaintained/android-httpclient.yaml
@@ -1,5 +1,5 @@
generatorName: android
outputDir: samples/client/petstore/android/httpclient
library: httpclient
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/android
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/android
diff --git a/bin/configs/unmaintained/android-volley.yaml b/bin/configs/unmaintained/android-volley.yaml
index 5c479033268..508ddfa42d4 100644
--- a/bin/configs/unmaintained/android-volley.yaml
+++ b/bin/configs/unmaintained/android-volley.yaml
@@ -1,7 +1,7 @@
generatorName: android
outputDir: samples/client/petstore/android/volley
library: volley
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/android
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/android
additionalProperties:
artifactId: petstore-android-volley
diff --git a/bin/configs/unmaintained/apache2.yaml b/bin/configs/unmaintained/apache2.yaml
index a5b28c44e51..ea5559bcea7 100644
--- a/bin/configs/unmaintained/apache2.yaml
+++ b/bin/configs/unmaintained/apache2.yaml
@@ -1,4 +1,4 @@
generatorName: apache2
outputDir: samples/config/petstore/apache2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/apache2
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/apache2
diff --git a/bin/configs/unmaintained/apex.yaml b/bin/configs/unmaintained/apex.yaml
index 23ec0ef743e..25b9ca77ec4 100644
--- a/bin/configs/unmaintained/apex.yaml
+++ b/bin/configs/unmaintained/apex.yaml
@@ -2,5 +2,5 @@ systemProperties:
skipFormModel: "true"
generatorName: apex
outputDir: samples/client/petstore/apex
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/apex
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/apex
diff --git a/bin/configs/unmaintained/asciidoc.yaml b/bin/configs/unmaintained/asciidoc.yaml
index 4d93790d87b..df1595a0540 100644
--- a/bin/configs/unmaintained/asciidoc.yaml
+++ b/bin/configs/unmaintained/asciidoc.yaml
@@ -1,7 +1,7 @@
generatorName: asciidoc
outputDir: samples/documentation/asciidoc
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/asciidoc-documentation
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/asciidoc-documentation
additionalProperties:
- specDir: modules/openapi-generator/src/main/resources/asciidoc-documentation
+ specDir: modules/openapi-json-schema-generator/src/main/resources/asciidoc-documentation
snippetDir: "."
diff --git a/bin/configs/unmaintained/aspnetcore-2.2.yaml b/bin/configs/unmaintained/aspnetcore-2.2.yaml
index 2f91ef75ede..d32f97ab278 100644
--- a/bin/configs/unmaintained/aspnetcore-2.2.yaml
+++ b/bin/configs/unmaintained/aspnetcore-2.2.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/2.1
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/2.1
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
aspnetCoreVersion: "2.2"
diff --git a/bin/configs/unmaintained/aspnetcore-3.0.yaml b/bin/configs/unmaintained/aspnetcore-3.0.yaml
index fcf9430d8b1..c6731eb6a99 100644
--- a/bin/configs/unmaintained/aspnetcore-3.0.yaml
+++ b/bin/configs/unmaintained/aspnetcore-3.0.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore-3.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/3.0
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
aspnetCoreVersion: "3.0"
diff --git a/bin/configs/unmaintained/aspnetcore-3.1.yaml b/bin/configs/unmaintained/aspnetcore-3.1.yaml
index 2859ae3629d..11e50b45255 100644
--- a/bin/configs/unmaintained/aspnetcore-3.1.yaml
+++ b/bin/configs/unmaintained/aspnetcore-3.1.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore-3.1
-inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/3.0
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
# comment out below as 3.1 the default
diff --git a/bin/configs/unmaintained/aspnetcore-5.0.yaml b/bin/configs/unmaintained/aspnetcore-5.0.yaml
index fd4e6d5fc2c..ccd095da999 100644
--- a/bin/configs/unmaintained/aspnetcore-5.0.yaml
+++ b/bin/configs/unmaintained/aspnetcore-5.0.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore-5.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/3.0
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
aspnetCoreVersion: "5.0"
diff --git a/bin/configs/unmaintained/aspnetcore-6.0-pocoModels.yaml b/bin/configs/unmaintained/aspnetcore-6.0-pocoModels.yaml
index 9e360262234..d98eecd704e 100644
--- a/bin/configs/unmaintained/aspnetcore-6.0-pocoModels.yaml
+++ b/bin/configs/unmaintained/aspnetcore-6.0-pocoModels.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore-6.0-pocoModels
-inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/3.0
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
aspnetCoreVersion: "6.0"
diff --git a/bin/configs/unmaintained/aspnetcore-6.0-project4Models.yaml b/bin/configs/unmaintained/aspnetcore-6.0-project4Models.yaml
index bb8b63602c5..e3d13bbe02e 100644
--- a/bin/configs/unmaintained/aspnetcore-6.0-project4Models.yaml
+++ b/bin/configs/unmaintained/aspnetcore-6.0-project4Models.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore-6.0-project4Models
-inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/3.0
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
aspnetCoreVersion: "6.0"
diff --git a/bin/configs/unmaintained/aspnetcore-6.0.yaml b/bin/configs/unmaintained/aspnetcore-6.0.yaml
index a5cd2cc235b..8cf1b4f7124 100644
--- a/bin/configs/unmaintained/aspnetcore-6.0.yaml
+++ b/bin/configs/unmaintained/aspnetcore-6.0.yaml
@@ -1,7 +1,7 @@
generatorName: aspnetcore
outputDir: samples/server/petstore/aspnetcore-6.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/aspnetcore/3.0
additionalProperties:
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
aspnetCoreVersion: "6.0"
diff --git a/bin/configs/unmaintained/avro-schema.yaml b/bin/configs/unmaintained/avro-schema.yaml
index 872043a6968..5dfd8d69765 100644
--- a/bin/configs/unmaintained/avro-schema.yaml
+++ b/bin/configs/unmaintained/avro-schema.yaml
@@ -1,4 +1,4 @@
generatorName: avro-schema
outputDir: samples/openapi3/schema/petstore/avro-schema
-inputSpec: modules/openapi-generator/src/test/resources/3_0/avro-schema/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/avro-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/avro-schema/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/avro-schema
diff --git a/bin/configs/unmaintained/bash.yaml b/bin/configs/unmaintained/bash.yaml
index 4ad33693827..85259c5657a 100644
--- a/bin/configs/unmaintained/bash.yaml
+++ b/bin/configs/unmaintained/bash.yaml
@@ -1,7 +1,7 @@
generatorName: bash
outputDir: samples/client/petstore/bash
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/bash
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/bash
additionalProperties:
generateZshCompletion: true
hostEnvironmentVariable: PETSTORE_HOST
diff --git a/bin/configs/unmaintained/c.yaml b/bin/configs/unmaintained/c.yaml
index f622e7919a6..5f964a1cce2 100644
--- a/bin/configs/unmaintained/c.yaml
+++ b/bin/configs/unmaintained/c.yaml
@@ -1,4 +1,4 @@
generatorName: c
outputDir: samples/client/petstore/c
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/C-libcurl
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/C-libcurl
diff --git a/bin/configs/unmaintained/clojure.yaml b/bin/configs/unmaintained/clojure.yaml
index f58c95316cd..a8239f4a6d9 100644
--- a/bin/configs/unmaintained/clojure.yaml
+++ b/bin/configs/unmaintained/clojure.yaml
@@ -1,4 +1,4 @@
generatorName: clojure
outputDir: samples/client/petstore/clojure
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.json
-templateDir: modules/openapi-generator/src/main/resources/clojure
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.json
+templateDir: modules/openapi-json-schema-generator/src/main/resources/clojure
diff --git a/bin/configs/unmaintained/cpp-pistache-server-cpp-pistache.yaml b/bin/configs/unmaintained/cpp-pistache-server-cpp-pistache.yaml
index 4a0326357ef..e471666dd6c 100644
--- a/bin/configs/unmaintained/cpp-pistache-server-cpp-pistache.yaml
+++ b/bin/configs/unmaintained/cpp-pistache-server-cpp-pistache.yaml
@@ -1,7 +1,7 @@
generatorName: cpp-pistache-server
outputDir: samples/server/petstore/cpp-pistache
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-pistache-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-pistache-server
additionalProperties:
useStructModel: "false"
addExternalLibs: "true"
diff --git a/bin/configs/unmaintained/cpp-qt-client.yaml b/bin/configs/unmaintained/cpp-qt-client.yaml
index 26f46eae4ae..f5f4986bb28 100644
--- a/bin/configs/unmaintained/cpp-qt-client.yaml
+++ b/bin/configs/unmaintained/cpp-qt-client.yaml
@@ -1,7 +1,7 @@
generatorName: cpp-qt-client
outputDir: samples/client/petstore/cpp-qt
-inputSpec: modules/openapi-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-qt-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/cpp-qt/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-qt-client
additionalProperties:
cppNamespace: test_namespace
modelNamePrefix: PFX
diff --git a/bin/configs/unmaintained/cpp-qt-qhttpengine-server.yaml b/bin/configs/unmaintained/cpp-qt-qhttpengine-server.yaml
index 9a03bcbc951..5a4a69fb7af 100644
--- a/bin/configs/unmaintained/cpp-qt-qhttpengine-server.yaml
+++ b/bin/configs/unmaintained/cpp-qt-qhttpengine-server.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-qt-qhttpengine-server
outputDir: samples/server/petstore/cpp-qt-qhttpengine-server
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-qt-qhttpengine-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-qt-qhttpengine-server
diff --git a/bin/configs/unmaintained/cpp-restbed-server.yaml b/bin/configs/unmaintained/cpp-restbed-server.yaml
index 6dc3929ec08..5ec72950719 100644
--- a/bin/configs/unmaintained/cpp-restbed-server.yaml
+++ b/bin/configs/unmaintained/cpp-restbed-server.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-restbed-server
outputDir: samples/server/petstore/cpp-restbed/generated/3_0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-restbed-server
diff --git a/bin/configs/unmaintained/cpp-restsdk-client.yaml b/bin/configs/unmaintained/cpp-restsdk-client.yaml
index fedc628a69e..80098617c2b 100644
--- a/bin/configs/unmaintained/cpp-restsdk-client.yaml
+++ b/bin/configs/unmaintained/cpp-restsdk-client.yaml
@@ -1,6 +1,6 @@
generatorName: cpp-restsdk
outputDir: samples/client/petstore/cpp-restsdk/client
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-rest-sdk-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-rest-sdk-client
additionalProperties:
packageName: CppRestPetstoreClient
diff --git a/bin/configs/unmaintained/cpp-tiny.yaml b/bin/configs/unmaintained/cpp-tiny.yaml
index 237ae1403f4..fb91a8330e7 100644
--- a/bin/configs/unmaintained/cpp-tiny.yaml
+++ b/bin/configs/unmaintained/cpp-tiny.yaml
@@ -1,7 +1,7 @@
generatorName: cpp-tiny
outputDir: samples/client/petstore/cpp-tiny
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-tiny
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-tiny
additionalProperties:
hideGenerationTimestamp: "true"
controller: "esp32"
diff --git a/bin/configs/unmaintained/cpp-tizen.yaml b/bin/configs/unmaintained/cpp-tizen.yaml
index 5efd42127c1..65f10ee169e 100644
--- a/bin/configs/unmaintained/cpp-tizen.yaml
+++ b/bin/configs/unmaintained/cpp-tizen.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-tizen
outputDir: samples/client/petstore/cpp-tizen
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-tizen-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-tizen-client
diff --git a/bin/configs/unmaintained/cpp-ue4.yaml b/bin/configs/unmaintained/cpp-ue4.yaml
index 98df851e2d2..978a4054949 100644
--- a/bin/configs/unmaintained/cpp-ue4.yaml
+++ b/bin/configs/unmaintained/cpp-ue4.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-ue4
outputDir: samples/client/petstore/cpp-ue4
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-ue4
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-ue4
diff --git a/bin/configs/unmaintained/crystal.yaml b/bin/configs/unmaintained/crystal.yaml
index 74badcce662..87d1a403d25 100644
--- a/bin/configs/unmaintained/crystal.yaml
+++ b/bin/configs/unmaintained/crystal.yaml
@@ -1,7 +1,7 @@
generatorName: crystal
outputDir: samples/client/petstore/crystal
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/crystal
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/crystal
additionalProperties:
shardVersion: 1.0.0
moduleName: Petstore
diff --git a/bin/configs/unmaintained/csharp-OpenAPIClient.yaml b/bin/configs/unmaintained/csharp-OpenAPIClient.yaml
index 5855eb4a350..127c5276d9f 100644
--- a/bin/configs/unmaintained/csharp-OpenAPIClient.yaml
+++ b/bin/configs/unmaintained/csharp-OpenAPIClient.yaml
@@ -1,6 +1,6 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/csharp-OpenAPIClientNet35.yaml b/bin/configs/unmaintained/csharp-OpenAPIClientNet35.yaml
index c308c2ceed9..1f8e80198e6 100644
--- a/bin/configs/unmaintained/csharp-OpenAPIClientNet35.yaml
+++ b/bin/configs/unmaintained/csharp-OpenAPIClientNet35.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientNet35
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
targetFramework: v3.5
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/csharp-OpenAPIClientNet40.yaml b/bin/configs/unmaintained/csharp-OpenAPIClientNet40.yaml
index bd5d7cf794e..6343c5573ac 100644
--- a/bin/configs/unmaintained/csharp-OpenAPIClientNet40.yaml
+++ b/bin/configs/unmaintained/csharp-OpenAPIClientNet40.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientNet40
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
targetFramework: v4.0
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/csharp-OpenAPIClientNetCoreProject.yaml b/bin/configs/unmaintained/csharp-OpenAPIClientNetCoreProject.yaml
index e9fca548604..5813ac6c88f 100644
--- a/bin/configs/unmaintained/csharp-OpenAPIClientNetCoreProject.yaml
+++ b/bin/configs/unmaintained/csharp-OpenAPIClientNetCoreProject.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientNetCoreProject
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
targetFramework: netstandard1.3
packageGuid: '{67035b31-f8e5-41a4-9673-954035084f7d}'
diff --git a/bin/configs/unmaintained/csharp-OpenAPIClientNetStandard.yaml b/bin/configs/unmaintained/csharp-OpenAPIClientNetStandard.yaml
index b4f72b50b28..01fbe3607b9 100644
--- a/bin/configs/unmaintained/csharp-OpenAPIClientNetStandard.yaml
+++ b/bin/configs/unmaintained/csharp-OpenAPIClientNetStandard.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
targetFramework: netstandard1.3
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/csharp-OpenAPIClientWithPropertyChanged.yaml b/bin/configs/unmaintained/csharp-OpenAPIClientWithPropertyChanged.yaml
index d5e7325510f..65f0593c414 100644
--- a/bin/configs/unmaintained/csharp-OpenAPIClientWithPropertyChanged.yaml
+++ b/bin/configs/unmaintained/csharp-OpenAPIClientWithPropertyChanged.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}'
generatePropertyChanged: "true"
diff --git a/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml b/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml
index 76c07c772d6..1cfbba67df0 100644
--- a/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml
+++ b/bin/configs/unmaintained/csharp-dotnet2-OpenAPIClient.yaml
@@ -1,6 +1,6 @@
generatorName: csharp-dotnet2
outputDir: samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-dotnet2
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-dotnet2
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
index d234b5399f2..33154979fab 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0-nrt.yaml
@@ -1,9 +1,9 @@
# for csharp-netcore generichost
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
index 1b07cd23c2c..c8f095850de 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netcore5.0.yaml
@@ -1,9 +1,9 @@
# for csharp-netcore generichost
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
index 597c9753d4f..fda971fed7c 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-generichost-netstandard2.0.yaml
@@ -1,9 +1,9 @@
# for csharp-netcore generichost
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-httpclient.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-httpclient.yaml
index 1139faf069c..b5539f840f8 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-httpclient.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-httpclient.yaml
@@ -1,8 +1,8 @@
# for .net standard httpclient
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
library: httpclient
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net47.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net47.yaml
index 35e90e8db71..157bd41e788 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net47.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net47.yaml
@@ -1,8 +1,8 @@
# for .net standard
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net50.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net50.yaml
index 9036f89e027..4175ccd9ab1 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net50.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient-net50.yaml
@@ -1,8 +1,8 @@
# for .net standard
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient.yaml
index 16bf7675519..09a33df345a 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient.yaml
@@ -1,8 +1,8 @@
# for .net standard
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCore.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCore.yaml
index bcdecbc653b..6fdb72b7bb6 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCore.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCore.yaml
@@ -1,7 +1,7 @@
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
targetFramework: netcoreapp3.1
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCoreAndNet47.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
index 45750b9f03e..4627abdea58 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClientCoreAndNet47.yaml
@@ -1,7 +1,7 @@
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClientCoreAndNet47
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
targetFramework: netstandard2.1;net47
diff --git a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml
index cc75d89db86..2a1db299aed 100644
--- a/bin/configs/unmaintained/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-OpenAPIClient_ConditionalSerialization.yaml
@@ -1,8 +1,8 @@
# for .net standard
generatorName: csharp-netcore
outputDir: samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization
-inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{fa96c953-af24-457d-8a01-f2fd2a7547a9}'
useCompareNetObjects: true
diff --git a/bin/configs/unmaintained/csharp-netcore-complex-files.yaml b/bin/configs/unmaintained/csharp-netcore-complex-files.yaml
index b67cece1ad1..a94a2c6c6f1 100644
--- a/bin/configs/unmaintained/csharp-netcore-complex-files.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-complex-files.yaml
@@ -1,7 +1,7 @@
generatorName: csharp-netcore
outputDir: samples/client/others/csharp-netcore-complex-files
-inputSpec: modules/openapi-generator/src/test/resources/3_0/form-multipart-binary-array.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/form-multipart-binary-array.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
targetFramework: netstandard2.0
diff --git a/bin/configs/unmaintained/csharp-netcore-functions.yaml b/bin/configs/unmaintained/csharp-netcore-functions.yaml
index 6d7e9a691b0..7bba90b74f8 100644
--- a/bin/configs/unmaintained/csharp-netcore-functions.yaml
+++ b/bin/configs/unmaintained/csharp-netcore-functions.yaml
@@ -1,6 +1,6 @@
generatorName: csharp-netcore-functions
outputDir: samples/client/petstore/csharp-netcore-functions
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-netcore-functions
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-netcore-functions
#additionalProperties:
# packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/cwiki.yaml b/bin/configs/unmaintained/cwiki.yaml
index bc17eb304fe..cb9631cd9c9 100644
--- a/bin/configs/unmaintained/cwiki.yaml
+++ b/bin/configs/unmaintained/cwiki.yaml
@@ -1,4 +1,4 @@
generatorName: cwiki
outputDir: samples/documentation/cwiki
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/confluenceWikiDocs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/confluenceWikiDocs
diff --git a/bin/configs/unmaintained/dart-dio-oneof-polymorphism-and-inheritance.yaml b/bin/configs/unmaintained/dart-dio-oneof-polymorphism-and-inheritance.yaml
index d3d5b622bc0..08218863b81 100644
--- a/bin/configs/unmaintained/dart-dio-oneof-polymorphism-and-inheritance.yaml
+++ b/bin/configs/unmaintained/dart-dio-oneof-polymorphism-and-inheritance.yaml
@@ -1,7 +1,7 @@
generatorName: dart-dio
outputDir: samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart/libraries/dio
typeMappings:
Client: "ModelClient"
File: "ModelFile"
diff --git a/bin/configs/unmaintained/dart-dio-oneof-primitive.yaml b/bin/configs/unmaintained/dart-dio-oneof-primitive.yaml
index 29130b5dc46..081aae311d9 100644
--- a/bin/configs/unmaintained/dart-dio-oneof-primitive.yaml
+++ b/bin/configs/unmaintained/dart-dio-oneof-primitive.yaml
@@ -1,7 +1,7 @@
generatorName: dart-dio
outputDir: samples/openapi3/client/petstore/dart-dio/oneof_primitive
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_primitive.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf_primitive.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart/libraries/dio
typeMappings:
Client: "ModelClient"
File: "ModelFile"
diff --git a/bin/configs/unmaintained/dart-dio-oneof.yaml b/bin/configs/unmaintained/dart-dio-oneof.yaml
index 865312cdd49..8bb84ee1781 100644
--- a/bin/configs/unmaintained/dart-dio-oneof.yaml
+++ b/bin/configs/unmaintained/dart-dio-oneof.yaml
@@ -1,7 +1,7 @@
generatorName: dart-dio
outputDir: samples/openapi3/client/petstore/dart-dio/oneof
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart/libraries/dio
typeMappings:
Client: "ModelClient"
File: "ModelFile"
diff --git a/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake-json_serializable.yaml b/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake-json_serializable.yaml
index 9809a61d7a0..750da402c7e 100644
--- a/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake-json_serializable.yaml
+++ b/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake-json_serializable.yaml
@@ -1,7 +1,7 @@
generatorName: dart-dio
outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart/libraries/dio
typeMappings:
Client: "ModelClient"
File: "ModelFile"
diff --git a/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake.yaml b/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake.yaml
index 3faed9515af..093d923f4f8 100644
--- a/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake.yaml
+++ b/bin/configs/unmaintained/dart-dio-petstore-client-lib-fake.yaml
@@ -1,7 +1,7 @@
generatorName: dart-dio
outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart/libraries/dio
typeMappings:
Client: "ModelClient"
File: "ModelFile"
diff --git a/bin/configs/unmaintained/dart-petstore-client-lib-fake.yaml b/bin/configs/unmaintained/dart-petstore-client-lib-fake.yaml
index d48cd8038b7..1aba00c8bf9 100644
--- a/bin/configs/unmaintained/dart-petstore-client-lib-fake.yaml
+++ b/bin/configs/unmaintained/dart-petstore-client-lib-fake.yaml
@@ -1,7 +1,7 @@
generatorName: dart
outputDir: samples/openapi3/client/petstore/dart2/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart2
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart2
typeMappings:
Client: "ModelClient"
File: "ModelFile"
diff --git a/bin/configs/unmaintained/dart-petstore-client-lib.yaml b/bin/configs/unmaintained/dart-petstore-client-lib.yaml
index 8b4a6deefd7..ad19f15a204 100644
--- a/bin/configs/unmaintained/dart-petstore-client-lib.yaml
+++ b/bin/configs/unmaintained/dart-petstore-client-lib.yaml
@@ -1,6 +1,6 @@
generatorName: dart
outputDir: samples/openapi3/client/petstore/dart2/petstore_client_lib
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/dart2
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/dart2
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/dynamic-html.yaml b/bin/configs/unmaintained/dynamic-html.yaml
index 6f32574d95a..3ee83cd9b51 100644
--- a/bin/configs/unmaintained/dynamic-html.yaml
+++ b/bin/configs/unmaintained/dynamic-html.yaml
@@ -1,4 +1,4 @@
generatorName: dynamic-html
outputDir: samples/documentation/dynamic-html
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/openapi-static
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/openapi-static
diff --git a/bin/configs/unmaintained/eiffel.yaml b/bin/configs/unmaintained/eiffel.yaml
index 53f9468802d..9d1d076e70d 100644
--- a/bin/configs/unmaintained/eiffel.yaml
+++ b/bin/configs/unmaintained/eiffel.yaml
@@ -1,4 +1,4 @@
generatorName: eiffel
outputDir: samples/client/petstore/eiffel
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Eiffel
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Eiffel
diff --git a/bin/configs/unmaintained/elixir.yaml b/bin/configs/unmaintained/elixir.yaml
index a287f44705b..970b6b8eb37 100644
--- a/bin/configs/unmaintained/elixir.yaml
+++ b/bin/configs/unmaintained/elixir.yaml
@@ -1,6 +1,6 @@
generatorName: elixir
outputDir: samples/client/petstore/elixir
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/elixir
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/elixir
additionalProperties:
invokerPackage: OpenapiPetstore
diff --git a/bin/configs/unmaintained/elm.yaml b/bin/configs/unmaintained/elm.yaml
index b826d487ddd..c3e9288c5d1 100644
--- a/bin/configs/unmaintained/elm.yaml
+++ b/bin/configs/unmaintained/elm.yaml
@@ -1,4 +1,4 @@
generatorName: elm
outputDir: samples/openapi3/client/elm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/elm.yaml
-templateDir: modules/openapi-generator/src/main/resources/elm
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/elm.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/elm
diff --git a/bin/configs/unmaintained/erlang-client.yaml b/bin/configs/unmaintained/erlang-client.yaml
index 27f1bdefe89..70e980dac86 100644
--- a/bin/configs/unmaintained/erlang-client.yaml
+++ b/bin/configs/unmaintained/erlang-client.yaml
@@ -1,6 +1,6 @@
generatorName: erlang-client
outputDir: samples/client/petstore/erlang-client
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/erlang-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/erlang-client
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/erlang-proper.yaml b/bin/configs/unmaintained/erlang-proper.yaml
index efde38060cd..bc77a82260b 100644
--- a/bin/configs/unmaintained/erlang-proper.yaml
+++ b/bin/configs/unmaintained/erlang-proper.yaml
@@ -1,6 +1,6 @@
generatorName: erlang-proper
outputDir: samples/client/petstore/erlang-proper
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/erlang-proper
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/erlang-proper
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/erlang-server.yaml b/bin/configs/unmaintained/erlang-server.yaml
index 043ec4ffa73..84331514f03 100644
--- a/bin/configs/unmaintained/erlang-server.yaml
+++ b/bin/configs/unmaintained/erlang-server.yaml
@@ -1,4 +1,4 @@
generatorName: erlang-server
outputDir: samples/server/petstore/erlang-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/erlang-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/erlang-server
diff --git a/bin/configs/unmaintained/fsharp-functions.yaml b/bin/configs/unmaintained/fsharp-functions.yaml
index c96a1707156..7eb582e0826 100644
--- a/bin/configs/unmaintained/fsharp-functions.yaml
+++ b/bin/configs/unmaintained/fsharp-functions.yaml
@@ -1,4 +1,4 @@
generatorName: fsharp-functions
outputDir: samples/server/petstore/fsharp-functions
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/fsharp-functions-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/fsharp-functions-server
diff --git a/bin/configs/unmaintained/fsharp-giraffe-server-fsharp-giraffe.yaml b/bin/configs/unmaintained/fsharp-giraffe-server-fsharp-giraffe.yaml
index 88882603304..6f24cd879ac 100644
--- a/bin/configs/unmaintained/fsharp-giraffe-server-fsharp-giraffe.yaml
+++ b/bin/configs/unmaintained/fsharp-giraffe-server-fsharp-giraffe.yaml
@@ -1,4 +1,4 @@
generatorName: fsharp-giraffe-server
outputDir: samples/server/petstore/fsharp-giraffe
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/fsharp-giraffe-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/fsharp-giraffe-server
diff --git a/bin/configs/unmaintained/go-echo-server-petstore-new.yaml b/bin/configs/unmaintained/go-echo-server-petstore-new.yaml
index bfc2e946c58..12b68c16170 100644
--- a/bin/configs/unmaintained/go-echo-server-petstore-new.yaml
+++ b/bin/configs/unmaintained/go-echo-server-petstore-new.yaml
@@ -1,6 +1,6 @@
generatorName: go-echo-server
outputDir: samples/server/petstore/go-echo-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-echo-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-echo-server
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/go-extensions-x-auth-id-alias.yaml b/bin/configs/unmaintained/go-extensions-x-auth-id-alias.yaml
index 5c3ab87b367..4de08876f17 100644
--- a/bin/configs/unmaintained/go-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/unmaintained/go-extensions-x-auth-id-alias.yaml
@@ -1,6 +1,6 @@
generatorName: go
outputDir: samples/openapi3/client/extensions/x-auth-id-alias/go-experimental
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go
additionalProperties:
packageName: x_auth_id_alias
diff --git a/bin/configs/unmaintained/go-gin-server-go-gin-api-server.yaml b/bin/configs/unmaintained/go-gin-server-go-gin-api-server.yaml
index 7d9932bd14f..3f8cf2434f4 100644
--- a/bin/configs/unmaintained/go-gin-server-go-gin-api-server.yaml
+++ b/bin/configs/unmaintained/go-gin-server-go-gin-api-server.yaml
@@ -1,7 +1,7 @@
generatorName: go-gin-server
outputDir: samples/server/petstore/go-gin-api-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-gin-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-gin-server
additionalProperties:
hideGenerationTimestamp: "true"
packageName: petstoreserver
diff --git a/bin/configs/unmaintained/go-petstore-oas2.yaml b/bin/configs/unmaintained/go-petstore-oas2.yaml
index 18cb77a9c25..a0ce5e6beca 100644
--- a/bin/configs/unmaintained/go-petstore-oas2.yaml
+++ b/bin/configs/unmaintained/go-petstore-oas2.yaml
@@ -1,7 +1,7 @@
generatorName: go
outputDir: samples/client/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go
additionalProperties:
packageName: petstore
generateInterfaces: true
diff --git a/bin/configs/unmaintained/go-petstore.yaml b/bin/configs/unmaintained/go-petstore.yaml
index 3ce286ca806..3536b92a700 100644
--- a/bin/configs/unmaintained/go-petstore.yaml
+++ b/bin/configs/unmaintained/go-petstore.yaml
@@ -1,7 +1,7 @@
generatorName: go
outputDir: samples/openapi3/client/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go
additionalProperties:
enumClassPrefix: "true"
packageName: petstore
diff --git a/bin/configs/unmaintained/go-server-chi-api-server.yaml b/bin/configs/unmaintained/go-server-chi-api-server.yaml
index 16db86a3d62..e3e80283648 100644
--- a/bin/configs/unmaintained/go-server-chi-api-server.yaml
+++ b/bin/configs/unmaintained/go-server-chi-api-server.yaml
@@ -1,7 +1,7 @@
generatorName: go-server
outputDir: samples/server/petstore/go-chi-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-server
additionalProperties:
hideGenerationTimestamp: "true"
packageName: petstoreserver
diff --git a/bin/configs/unmaintained/go-server-go-api-server.yaml b/bin/configs/unmaintained/go-server-go-api-server.yaml
index 7fb761639b2..aadddd4c84d 100644
--- a/bin/configs/unmaintained/go-server-go-api-server.yaml
+++ b/bin/configs/unmaintained/go-server-go-api-server.yaml
@@ -1,7 +1,7 @@
generatorName: go-server
outputDir: samples/server/petstore/go-api-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-server
additionalProperties:
hideGenerationTimestamp: "true"
packageName: petstoreserver
diff --git a/bin/configs/unmaintained/go-server-required.yaml b/bin/configs/unmaintained/go-server-required.yaml
index fd90bbbeb83..c6eaf8deaa7 100644
--- a/bin/configs/unmaintained/go-server-required.yaml
+++ b/bin/configs/unmaintained/go-server-required.yaml
@@ -1,7 +1,7 @@
generatorName: go-server
outputDir: samples/server/petstore/go-server-required
-inputSpec: modules/openapi-generator/src/test/resources/3_0/server-required.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/server-required.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-server
additionalProperties:
hideGenerationTimestamp: "true"
packageName: petstoreserver
diff --git a/bin/configs/unmaintained/graphql-nodejs-express-server.yaml b/bin/configs/unmaintained/graphql-nodejs-express-server.yaml
index a26f6ad4448..1bb81790331 100644
--- a/bin/configs/unmaintained/graphql-nodejs-express-server.yaml
+++ b/bin/configs/unmaintained/graphql-nodejs-express-server.yaml
@@ -1,6 +1,6 @@
generatorName: graphql-nodejs-express-server
outputDir: samples/server/petstore/graphql-nodejs-express-server
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/graphql-nodejs-express-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/graphql-nodejs-express-server
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/graphql-schema.yaml b/bin/configs/unmaintained/graphql-schema.yaml
index 2b019d74f63..c0507ee5730 100644
--- a/bin/configs/unmaintained/graphql-schema.yaml
+++ b/bin/configs/unmaintained/graphql-schema.yaml
@@ -1,6 +1,6 @@
generatorName: graphql-schema
outputDir: samples/config/petstore/graphql-schema
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/graphql-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/graphql-schema
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/groovy.yaml b/bin/configs/unmaintained/groovy.yaml
index df745d168e1..9875d97b5b9 100644
--- a/bin/configs/unmaintained/groovy.yaml
+++ b/bin/configs/unmaintained/groovy.yaml
@@ -1,6 +1,6 @@
generatorName: groovy
outputDir: samples/client/petstore/groovy
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Groovy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Groovy
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/haskell-http-client.yaml b/bin/configs/unmaintained/haskell-http-client.yaml
index 1f2dc62fe60..01142c57ae3 100644
--- a/bin/configs/unmaintained/haskell-http-client.yaml
+++ b/bin/configs/unmaintained/haskell-http-client.yaml
@@ -1,6 +1,6 @@
generatorName: haskell-http-client
outputDir: samples/client/petstore/haskell-http-client
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/haskell-http-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/haskell-http-client
additionalProperties:
queryExtraUnreserved: ''
diff --git a/bin/configs/unmaintained/haskell-servant.yaml b/bin/configs/unmaintained/haskell-servant.yaml
index 1419e549097..10eb19c1dda 100644
--- a/bin/configs/unmaintained/haskell-servant.yaml
+++ b/bin/configs/unmaintained/haskell-servant.yaml
@@ -1,4 +1,4 @@
generatorName: haskell
outputDir: samples/server/petstore/haskell-servant
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/haskell-servant
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/haskell-servant
diff --git a/bin/configs/unmaintained/haskell-yesod-petstore-new.yaml b/bin/configs/unmaintained/haskell-yesod-petstore-new.yaml
index f7ae3890cdf..d413bff6dbe 100644
--- a/bin/configs/unmaintained/haskell-yesod-petstore-new.yaml
+++ b/bin/configs/unmaintained/haskell-yesod-petstore-new.yaml
@@ -1,6 +1,6 @@
generatorName: haskell-yesod
outputDir: samples/server/petstore/haskell-yesod
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/haskell-yesod
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/haskell-yesod
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/html.md.yaml b/bin/configs/unmaintained/html.md.yaml
index 23980658eff..c77dcd5182f 100644
--- a/bin/configs/unmaintained/html.md.yaml
+++ b/bin/configs/unmaintained/html.md.yaml
@@ -1,4 +1,4 @@
generatorName: html
outputDir: samples/documentation/html.md
-inputSpec: modules/openapi-generator/src/test/resources/2_0/markdown.yaml
-templateDir: modules/openapi-generator/src/main/resources/htmlDocs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/markdown.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/htmlDocs
diff --git a/bin/configs/unmaintained/html.yaml b/bin/configs/unmaintained/html.yaml
index ea24dcbd4b9..eabeb902223 100644
--- a/bin/configs/unmaintained/html.yaml
+++ b/bin/configs/unmaintained/html.yaml
@@ -1,4 +1,4 @@
generatorName: html
outputDir: samples/documentation/html
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/htmlDocs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/htmlDocs
diff --git a/bin/configs/unmaintained/html2.yaml b/bin/configs/unmaintained/html2.yaml
index 09022fd5fbc..873d8af5e56 100644
--- a/bin/configs/unmaintained/html2.yaml
+++ b/bin/configs/unmaintained/html2.yaml
@@ -1,6 +1,6 @@
generatorName: html2
outputDir: samples/documentation/html2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/htmlDocs2
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/htmlDocs2
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-apache-httpclient.yaml b/bin/configs/unmaintained/java-apache-httpclient.yaml
index 5696973f86f..3d550b322f1 100644
--- a/bin/configs/unmaintained/java-apache-httpclient.yaml
+++ b/bin/configs/unmaintained/java-apache-httpclient.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/apache-httpclient
library: apache-httpclient
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-apache-httpclient
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-camel-petstore-new.yaml b/bin/configs/unmaintained/java-camel-petstore-new.yaml
index 9b28eaf1ee7..60f71c541cb 100644
--- a/bin/configs/unmaintained/java-camel-petstore-new.yaml
+++ b/bin/configs/unmaintained/java-camel-petstore-new.yaml
@@ -1,7 +1,7 @@
generatorName: java-camel
outputDir: samples/server/petstore/java-camel
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/java-camel-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/java-camel-server
additionalProperties:
oas3: "true"
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-feign-no-nullable.yaml b/bin/configs/unmaintained/java-feign-no-nullable.yaml
index 05453b419dc..0dd1ca8733c 100644
--- a/bin/configs/unmaintained/java-feign-no-nullable.yaml
+++ b/bin/configs/unmaintained/java-feign-no-nullable.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/feign-no-nullable
library: feign
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
booleanGetterPrefix: is
artifactId: petstore-feign-no-nullable
diff --git a/bin/configs/unmaintained/java-feign.yaml b/bin/configs/unmaintained/java-feign.yaml
index c27e7abaaab..149c5ba3e84 100644
--- a/bin/configs/unmaintained/java-feign.yaml
+++ b/bin/configs/unmaintained/java-feign.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/feign
library: feign
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
booleanGetterPrefix: is
artifactId: petstore-feign
diff --git a/bin/configs/unmaintained/java-google-api-client.yaml b/bin/configs/unmaintained/java-google-api-client.yaml
index 7fed4f4fd38..e6c14928eb2 100644
--- a/bin/configs/unmaintained/java-google-api-client.yaml
+++ b/bin/configs/unmaintained/java-google-api-client.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/google-api-client
library: google-api-client
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-google-api-client
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-inflector.yaml b/bin/configs/unmaintained/java-inflector.yaml
index d7a88695aca..7414833d20b 100644
--- a/bin/configs/unmaintained/java-inflector.yaml
+++ b/bin/configs/unmaintained/java-inflector.yaml
@@ -1,6 +1,6 @@
generatorName: java-inflector
outputDir: samples/server/petstore/java-inflector
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaInflector
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaInflector
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-jersey1.yaml b/bin/configs/unmaintained/java-jersey1.yaml
index 26cf1f0e5c1..f9f2445fe79 100644
--- a/bin/configs/unmaintained/java-jersey1.yaml
+++ b/bin/configs/unmaintained/java-jersey1.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/jersey1
library: jersey1
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
hideGenerationTimestamp: "true"
artifactId: petstore-java-client-jersey1
diff --git a/bin/configs/unmaintained/java-jersey2-8-oas2.yaml b/bin/configs/unmaintained/java-jersey2-8-oas2.yaml
index 4d3253e23ee..e7821c2fe3c 100644
--- a/bin/configs/unmaintained/java-jersey2-8-oas2.yaml
+++ b/bin/configs/unmaintained/java-jersey2-8-oas2.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/jersey2-java8
library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-jersey2-java8
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-jersey2-8.yaml b/bin/configs/unmaintained/java-jersey2-8.yaml
index ca0452d33e3..48c83ab0b3b 100644
--- a/bin/configs/unmaintained/java-jersey2-8.yaml
+++ b/bin/configs/unmaintained/java-jersey2-8.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/openapi3/client/petstore/java/jersey2-java8
library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-openapi3-jersey2-java8
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-jersey2-extensions-x-auth-id-alias.yaml b/bin/configs/unmaintained/java-jersey2-extensions-x-auth-id-alias.yaml
index f651475259d..d95df0ef5c6 100644
--- a/bin/configs/unmaintained/java-jersey2-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/unmaintained/java-jersey2-extensions-x-auth-id-alias.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8
library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: openapi3-extensions-x-auth-id-alias-jersey2-java8
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-jersey2-java8-localdatetime.yaml b/bin/configs/unmaintained/java-jersey2-java8-localdatetime.yaml
index efa977d08a3..dfe5fd4c74c 100644
--- a/bin/configs/unmaintained/java-jersey2-java8-localdatetime.yaml
+++ b/bin/configs/unmaintained/java-jersey2-java8-localdatetime.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/jersey2-java8-localdatetime
library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-jersey2-java8-localdatetime
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-jersey2-special-characters.yaml b/bin/configs/unmaintained/java-jersey2-special-characters.yaml
index c73b70cc36c..5d50633f744 100644
--- a/bin/configs/unmaintained/java-jersey2-special-characters.yaml
+++ b/bin/configs/unmaintained/java-jersey2-special-characters.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/openapi3/client/petstore/java/jersey2-java8-special-characters
library: jersey2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-special-characters.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/schema-with-special-characters.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-openapi3-jersey2-java8-special-characters
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-jersey3.yaml b/bin/configs/unmaintained/java-jersey3.yaml
index 50ea3258eca..77e4f0135bc 100644
--- a/bin/configs/unmaintained/java-jersey3.yaml
+++ b/bin/configs/unmaintained/java-jersey3.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/jersey3
library: jersey3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-jersey3
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/java-micronaut-client.yaml b/bin/configs/unmaintained/java-micronaut-client.yaml
index 247c139afb4..9516fe30078 100644
--- a/bin/configs/unmaintained/java-micronaut-client.yaml
+++ b/bin/configs/unmaintained/java-micronaut-client.yaml
@@ -1,6 +1,6 @@
generatorName: java-micronaut-client
outputDir: samples/client/petstore/java-micronaut-client/
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
additionalProperties:
artifactId: petstore-micronaut
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-micronaut-server.yaml b/bin/configs/unmaintained/java-micronaut-server.yaml
index 15b9ba58b32..5aa2e2417a4 100644
--- a/bin/configs/unmaintained/java-micronaut-server.yaml
+++ b/bin/configs/unmaintained/java-micronaut-server.yaml
@@ -1,6 +1,6 @@
generatorName: java-micronaut-server
outputDir: samples/server/petstore/java-micronaut-server/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
additionalProperties:
artifactId: petstore-micronaut-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-microprofile-rest-client-3.0.yaml b/bin/configs/unmaintained/java-microprofile-rest-client-3.0.yaml
index e0a2c0a3178..143aebfe9d2 100644
--- a/bin/configs/unmaintained/java-microprofile-rest-client-3.0.yaml
+++ b/bin/configs/unmaintained/java-microprofile-rest-client-3.0.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/microprofile-rest-client-3.0
library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: microprofile-rest-client-3
configKey: petstore
diff --git a/bin/configs/unmaintained/java-microprofile-rest-client.yaml b/bin/configs/unmaintained/java-microprofile-rest-client.yaml
index 384a6aa7f30..8a2bbe58b7b 100644
--- a/bin/configs/unmaintained/java-microprofile-rest-client.yaml
+++ b/bin/configs/unmaintained/java-microprofile-rest-client.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/microprofile-rest-client
library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: microprofile-rest-client
configKey: petstore
diff --git a/bin/configs/unmaintained/java-msf4j.yaml b/bin/configs/unmaintained/java-msf4j.yaml
index 71c5d117d83..79a97dd6bfe 100644
--- a/bin/configs/unmaintained/java-msf4j.yaml
+++ b/bin/configs/unmaintained/java-msf4j.yaml
@@ -1,7 +1,7 @@
generatorName: java-msf4j
outputDir: samples/server/petstore/java-msf4j
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/java-msf4j-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/java-msf4j-server
additionalProperties:
hideGenerationTimestamp: "true"
artifactId: java-msf4j-server
diff --git a/bin/configs/unmaintained/java-native-async.yaml b/bin/configs/unmaintained/java-native-async.yaml
index eb95d524a29..8a7911e2812 100644
--- a/bin/configs/unmaintained/java-native-async.yaml
+++ b/bin/configs/unmaintained/java-native-async.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/native-async
library: native
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-native
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-native.yaml b/bin/configs/unmaintained/java-native.yaml
index 14259765250..25a7ee5356a 100644
--- a/bin/configs/unmaintained/java-native.yaml
+++ b/bin/configs/unmaintained/java-native.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/native
library: native
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-native
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-okhttp-gson-dynamicOperations.yaml b/bin/configs/unmaintained/java-okhttp-gson-dynamicOperations.yaml
index 751ce2e992c..05d16a30031 100644
--- a/bin/configs/unmaintained/java-okhttp-gson-dynamicOperations.yaml
+++ b/bin/configs/unmaintained/java-okhttp-gson-dynamicOperations.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/okhttp-gson-dynamicOperations
library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-okhttp-gson-dynamicoperations
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-okhttp-gson-group-parameter.yaml b/bin/configs/unmaintained/java-okhttp-gson-group-parameter.yaml
index 936f9f0a4b0..eae0c9e0a0f 100644
--- a/bin/configs/unmaintained/java-okhttp-gson-group-parameter.yaml
+++ b/bin/configs/unmaintained/java-okhttp-gson-group-parameter.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/okhttp-gson-group-parameter
library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-group-parameter.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-group-parameter.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-okhttp-gson-group-parameter
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-okhttp-gson-parcelableModel.yaml b/bin/configs/unmaintained/java-okhttp-gson-parcelableModel.yaml
index c9cbb2008b1..db9e1ffe5dd 100644
--- a/bin/configs/unmaintained/java-okhttp-gson-parcelableModel.yaml
+++ b/bin/configs/unmaintained/java-okhttp-gson-parcelableModel.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/okhttp-gson-parcelableModel
library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
parcelableModel: "true"
artifactId: petstore-okhttp-gson-parcelableModel
diff --git a/bin/configs/unmaintained/java-okhttp-gson-streaming.yaml b/bin/configs/unmaintained/java-okhttp-gson-streaming.yaml
index 34da56581a7..8744d0944bf 100644
--- a/bin/configs/unmaintained/java-okhttp-gson-streaming.yaml
+++ b/bin/configs/unmaintained/java-okhttp-gson-streaming.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/others/java/okhttp-gson-streaming
library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/3_0/streaming.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/streaming.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-okhttp-gson
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-okhttp-gson.yaml b/bin/configs/unmaintained/java-okhttp-gson.yaml
index e138af15401..0a8198dd56a 100644
--- a/bin/configs/unmaintained/java-okhttp-gson.yaml
+++ b/bin/configs/unmaintained/java-okhttp-gson.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/okhttp-gson
library: okhttp-gson
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-okhttp-gson
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-pkmst.yaml b/bin/configs/unmaintained/java-pkmst.yaml
index 4d428c3679c..4442277bd02 100644
--- a/bin/configs/unmaintained/java-pkmst.yaml
+++ b/bin/configs/unmaintained/java-pkmst.yaml
@@ -1,6 +1,6 @@
generatorName: java-pkmst
outputDir: samples/server/petstore/java-pkmst
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/java-pkmst
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/java-pkmst
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-play-framework-api-package-override.yaml b/bin/configs/unmaintained/java-play-framework-api-package-override.yaml
index 93b1d8f1788..507ed0c358c 100644
--- a/bin/configs/unmaintained/java-play-framework-api-package-override.yaml
+++ b/bin/configs/unmaintained/java-play-framework-api-package-override.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-api-package-override
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
apiPackage: com.puppies.store.apis
diff --git a/bin/configs/unmaintained/java-play-framework-async.yaml b/bin/configs/unmaintained/java-play-framework-async.yaml
index 0cf9d1bca2e..1d9606b9a51 100644
--- a/bin/configs/unmaintained/java-play-framework-async.yaml
+++ b/bin/configs/unmaintained/java-play-framework-async.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-async
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
supportAsync: true
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-play-framework-controller-only.yaml b/bin/configs/unmaintained/java-play-framework-controller-only.yaml
index 8c4ceb8afa6..6cea6da49c4 100644
--- a/bin/configs/unmaintained/java-play-framework-controller-only.yaml
+++ b/bin/configs/unmaintained/java-play-framework-controller-only.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-controller-only
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
controllerOnly: "true"
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-play-framework-fake-endpoints-with-security.yaml b/bin/configs/unmaintained/java-play-framework-fake-endpoints-with-security.yaml
index b21a8a9ba0c..14724247eba 100644
--- a/bin/configs/unmaintained/java-play-framework-fake-endpoints-with-security.yaml
+++ b/bin/configs/unmaintained/java-play-framework-fake-endpoints-with-security.yaml
@@ -1,6 +1,6 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-fake-endpoints-with-security
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-play-framework-fake-endpoints.yaml b/bin/configs/unmaintained/java-play-framework-fake-endpoints.yaml
index 7ab4bb95563..1b9c5987c6b 100644
--- a/bin/configs/unmaintained/java-play-framework-fake-endpoints.yaml
+++ b/bin/configs/unmaintained/java-play-framework-fake-endpoints.yaml
@@ -1,6 +1,6 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-fake-endpoints
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-play-framework-no-bean-validation.yaml b/bin/configs/unmaintained/java-play-framework-no-bean-validation.yaml
index 22614f20d8d..1235e38877e 100644
--- a/bin/configs/unmaintained/java-play-framework-no-bean-validation.yaml
+++ b/bin/configs/unmaintained/java-play-framework-no-bean-validation.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-no-bean-validation
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
useBeanValidation: "false"
diff --git a/bin/configs/unmaintained/java-play-framework-no-exception-handling.yaml b/bin/configs/unmaintained/java-play-framework-no-exception-handling.yaml
index f231fbb9607..f7e858d92ae 100644
--- a/bin/configs/unmaintained/java-play-framework-no-exception-handling.yaml
+++ b/bin/configs/unmaintained/java-play-framework-no-exception-handling.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-no-exception-handling
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
handleExceptions: "false"
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-play-framework-no-interface.yaml b/bin/configs/unmaintained/java-play-framework-no-interface.yaml
index 51633c13dc5..1a84c67247a 100644
--- a/bin/configs/unmaintained/java-play-framework-no-interface.yaml
+++ b/bin/configs/unmaintained/java-play-framework-no-interface.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-no-interface
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
useInterfaces: "false"
diff --git a/bin/configs/unmaintained/java-play-framework-no-nullable.yaml b/bin/configs/unmaintained/java-play-framework-no-nullable.yaml
index 3eaf7366c2a..ef1655108af 100644
--- a/bin/configs/unmaintained/java-play-framework-no-nullable.yaml
+++ b/bin/configs/unmaintained/java-play-framework-no-nullable.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-no-nullable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
openApiNullable: "false"
diff --git a/bin/configs/unmaintained/java-play-framework-no-swagger-ui.yaml b/bin/configs/unmaintained/java-play-framework-no-swagger-ui.yaml
index b2cb39224b6..6d03355d7eb 100644
--- a/bin/configs/unmaintained/java-play-framework-no-swagger-ui.yaml
+++ b/bin/configs/unmaintained/java-play-framework-no-swagger-ui.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-no-swagger-ui
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
useSwaggerUI: "false"
diff --git a/bin/configs/unmaintained/java-play-framework-no-wrap-calls.yaml b/bin/configs/unmaintained/java-play-framework-no-wrap-calls.yaml
index d8ab5013bde..62beca64e9c 100644
--- a/bin/configs/unmaintained/java-play-framework-no-wrap-calls.yaml
+++ b/bin/configs/unmaintained/java-play-framework-no-wrap-calls.yaml
@@ -1,7 +1,7 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework-no-wrap-calls
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
wrapCalls: "false"
diff --git a/bin/configs/unmaintained/java-play-framework.yaml b/bin/configs/unmaintained/java-play-framework.yaml
index ee9b2705273..5c941a100a5 100644
--- a/bin/configs/unmaintained/java-play-framework.yaml
+++ b/bin/configs/unmaintained/java-play-framework.yaml
@@ -1,6 +1,6 @@
generatorName: java-play-framework
outputDir: samples/server/petstore/java-play-framework
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaPlayFramework
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaPlayFramework
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-rest-assured-jackson.yaml b/bin/configs/unmaintained/java-rest-assured-jackson.yaml
index db2014be022..a6c222cfc93 100644
--- a/bin/configs/unmaintained/java-rest-assured-jackson.yaml
+++ b/bin/configs/unmaintained/java-rest-assured-jackson.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: ./samples/client/petstore/java/rest-assured-jackson
library: rest-assured
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
serializationLibrary: jackson
dateLibrary: java8
diff --git a/bin/configs/unmaintained/java-rest-assured.yaml b/bin/configs/unmaintained/java-rest-assured.yaml
index 39426761ef2..af78df2db7a 100644
--- a/bin/configs/unmaintained/java-rest-assured.yaml
+++ b/bin/configs/unmaintained/java-rest-assured.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/rest-assured
library: rest-assured
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
performBeanValidation: "true"
useBeanValidation: "true"
diff --git a/bin/configs/unmaintained/java-resteasy.yaml b/bin/configs/unmaintained/java-resteasy.yaml
index a6b09924858..b5c15c9a579 100644
--- a/bin/configs/unmaintained/java-resteasy.yaml
+++ b/bin/configs/unmaintained/java-resteasy.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/resteasy
library: resteasy
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-resteasy
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-resttemplate-withXml.yaml b/bin/configs/unmaintained/java-resttemplate-withXml.yaml
index c0122422f0a..2ff258d5995 100644
--- a/bin/configs/unmaintained/java-resttemplate-withXml.yaml
+++ b/bin/configs/unmaintained/java-resttemplate-withXml.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/resttemplate-withXml
library: resttemplate
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
java8: true
withXml: "true"
diff --git a/bin/configs/unmaintained/java-resttemplate.yaml b/bin/configs/unmaintained/java-resttemplate.yaml
index 9c61a34ba90..919827a25b9 100644
--- a/bin/configs/unmaintained/java-resttemplate.yaml
+++ b/bin/configs/unmaintained/java-resttemplate.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/resttemplate
library: resttemplate
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-resttemplate
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-retrofit2-play26.yaml b/bin/configs/unmaintained/java-retrofit2-play26.yaml
index b65e8a3a95c..8fdcbc7de13 100644
--- a/bin/configs/unmaintained/java-retrofit2-play26.yaml
+++ b/bin/configs/unmaintained/java-retrofit2-play26.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/retrofit2-play26
library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
usePlayWS: "true"
enableBuilderSupport: "true"
diff --git a/bin/configs/unmaintained/java-retrofit2.yaml b/bin/configs/unmaintained/java-retrofit2.yaml
index 2879e3e4493..3e844e112da 100644
--- a/bin/configs/unmaintained/java-retrofit2.yaml
+++ b/bin/configs/unmaintained/java-retrofit2.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/retrofit2
library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-retrofit2
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-retrofit2rx2.yaml b/bin/configs/unmaintained/java-retrofit2rx2.yaml
index dfb55acb481..5bc6946770c 100644
--- a/bin/configs/unmaintained/java-retrofit2rx2.yaml
+++ b/bin/configs/unmaintained/java-retrofit2rx2.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/retrofit2rx2
library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
useRxJava2: "true"
artifactId: petstore-retrofit2-rx2
diff --git a/bin/configs/unmaintained/java-retrofit2rx3.yaml b/bin/configs/unmaintained/java-retrofit2rx3.yaml
index e4a1b5207c6..bbda2397ecc 100644
--- a/bin/configs/unmaintained/java-retrofit2rx3.yaml
+++ b/bin/configs/unmaintained/java-retrofit2rx3.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/retrofit2rx3
library: retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
useRxJava3: "true"
artifactId: petstore-retrofit2-rx3
diff --git a/bin/configs/unmaintained/java-undertow-server-java-undertow.yaml b/bin/configs/unmaintained/java-undertow-server-java-undertow.yaml
index 2cbb1160f17..02e2609cc58 100644
--- a/bin/configs/unmaintained/java-undertow-server-java-undertow.yaml
+++ b/bin/configs/unmaintained/java-undertow-server-java-undertow.yaml
@@ -1,6 +1,6 @@
generatorName: java-undertow-server
outputDir: samples/server/petstore/java-undertow
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/java-undertow-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/java-undertow-server
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-vertx-async.yaml b/bin/configs/unmaintained/java-vertx-async.yaml
index cbc5b3c1c97..d9c05649f26 100644
--- a/bin/configs/unmaintained/java-vertx-async.yaml
+++ b/bin/configs/unmaintained/java-vertx-async.yaml
@@ -1,7 +1,7 @@
generatorName: java-vertx
outputDir: samples/server/petstore/java-vertx/async
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaVertXServer
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaVertXServer
additionalProperties:
hideGenerationTimestamp: "true"
vertxSwaggerRouterVersion: 1.4.0
diff --git a/bin/configs/unmaintained/java-vertx-no-nullable.yaml b/bin/configs/unmaintained/java-vertx-no-nullable.yaml
index 1282bdfae71..3f1a1362efd 100644
--- a/bin/configs/unmaintained/java-vertx-no-nullable.yaml
+++ b/bin/configs/unmaintained/java-vertx-no-nullable.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/vertx-no-nullable
library: vertx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-vertx-no-nullable
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-vertx-rx.yaml b/bin/configs/unmaintained/java-vertx-rx.yaml
index d5dde08656e..8fa8be0f48d 100644
--- a/bin/configs/unmaintained/java-vertx-rx.yaml
+++ b/bin/configs/unmaintained/java-vertx-rx.yaml
@@ -1,7 +1,7 @@
generatorName: java-vertx
outputDir: samples/server/petstore/java-vertx/rx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaVertXServer
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaVertXServer
additionalProperties:
artifactId: java-vertx-rx-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-vertx-web-server.yaml b/bin/configs/unmaintained/java-vertx-web-server.yaml
index 204f89ebf1c..ead05997008 100644
--- a/bin/configs/unmaintained/java-vertx-web-server.yaml
+++ b/bin/configs/unmaintained/java-vertx-web-server.yaml
@@ -1,7 +1,7 @@
generatorName: java-vertx-web
outputDir: samples/server/petstore/java-vertx-web
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaVertXWebServer
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaVertXWebServer
additionalProperties:
hideGenerationTimestamp: "true"
artifactId: java-vertx-web-server
diff --git a/bin/configs/unmaintained/java-vertx.yaml b/bin/configs/unmaintained/java-vertx.yaml
index cf019b5da88..6dcd79274c6 100644
--- a/bin/configs/unmaintained/java-vertx.yaml
+++ b/bin/configs/unmaintained/java-vertx.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/vertx
library: vertx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-vertx
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-webclient-nullable-array.yaml b/bin/configs/unmaintained/java-webclient-nullable-array.yaml
index 24d280bc8cb..a30f092a22e 100644
--- a/bin/configs/unmaintained/java-webclient-nullable-array.yaml
+++ b/bin/configs/unmaintained/java-webclient-nullable-array.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/webclient-nulable-arrays
library: webclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-webclient-nullable-arrays
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/java-webclient.yaml b/bin/configs/unmaintained/java-webclient.yaml
index a78b3f5e47d..7d155166eb7 100644
--- a/bin/configs/unmaintained/java-webclient.yaml
+++ b/bin/configs/unmaintained/java-webclient.yaml
@@ -1,8 +1,8 @@
generatorName: java
outputDir: samples/client/petstore/java/webclient
library: webclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Java
additionalProperties:
artifactId: petstore-webclient
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/javascript-apollo.yaml b/bin/configs/unmaintained/javascript-apollo.yaml
index 74853eec57f..50522c394ae 100644
--- a/bin/configs/unmaintained/javascript-apollo.yaml
+++ b/bin/configs/unmaintained/javascript-apollo.yaml
@@ -1,7 +1,7 @@
generatorName: javascript
outputDir: samples/client/petstore/javascript-apollo
library: apollo
-inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Javascript
additionalProperties:
appName: PetstoreClient
diff --git a/bin/configs/unmaintained/javascript-closure-angular.yaml b/bin/configs/unmaintained/javascript-closure-angular.yaml
index d911066fc6f..8cf50dac764 100644
--- a/bin/configs/unmaintained/javascript-closure-angular.yaml
+++ b/bin/configs/unmaintained/javascript-closure-angular.yaml
@@ -1,4 +1,4 @@
generatorName: javascript-closure-angular
outputDir: samples/client/petstore/javascript-closure-angular
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript-Closure-Angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Javascript-Closure-Angular
diff --git a/bin/configs/unmaintained/javascript-es6.yaml b/bin/configs/unmaintained/javascript-es6.yaml
index 67f013b0c51..0ef1d4974e0 100644
--- a/bin/configs/unmaintained/javascript-es6.yaml
+++ b/bin/configs/unmaintained/javascript-es6.yaml
@@ -1,7 +1,7 @@
generatorName: javascript
outputDir: samples/client/petstore/javascript-es6
library: javascript
-inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Javascript
additionalProperties:
appName: PetstoreClient
diff --git a/bin/configs/unmaintained/javascript-flowtyped.yaml b/bin/configs/unmaintained/javascript-flowtyped.yaml
index 514f7fe1dfe..23708aab539 100644
--- a/bin/configs/unmaintained/javascript-flowtyped.yaml
+++ b/bin/configs/unmaintained/javascript-flowtyped.yaml
@@ -1,6 +1,6 @@
generatorName: javascript-flowtyped
outputDir: samples/client/petstore/javascript-flowtyped
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript-Flowtyped
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Javascript-Flowtyped
additionalProperties:
appName: PetstoreClient
diff --git a/bin/configs/unmaintained/javascript-promise-es6.yaml b/bin/configs/unmaintained/javascript-promise-es6.yaml
index 9ffae513eb8..765c4aee0f0 100644
--- a/bin/configs/unmaintained/javascript-promise-es6.yaml
+++ b/bin/configs/unmaintained/javascript-promise-es6.yaml
@@ -1,8 +1,8 @@
generatorName: javascript
outputDir: samples/client/petstore/javascript-promise-es6
library: javascript
-inputSpec: modules/openapi-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Javascript
additionalProperties:
usePromises: "true"
appName: PetstoreClient
diff --git a/bin/configs/unmaintained/jaxrs-cxf-annotated-base-path.yaml b/bin/configs/unmaintained/jaxrs-cxf-annotated-base-path.yaml
index ddff8105f24..d47f254d8e8 100644
--- a/bin/configs/unmaintained/jaxrs-cxf-annotated-base-path.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf-annotated-base-path.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-cxf
outputDir: samples/server/petstore/jaxrs-cxf-annotated-base-path
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
artifactId: cxf-annotated-basepath
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-cxf-cdi.yaml b/bin/configs/unmaintained/jaxrs-cxf-cdi.yaml
index 63299c1d4e9..04d77acf713 100644
--- a/bin/configs/unmaintained/jaxrs-cxf-cdi.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf-cdi.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-cxf-cdi
outputDir: samples/server/petstore/jaxrs-cxf-cdi
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf-cdi
additionalProperties:
hideGenerationTimestamp: "true"
implicitHeadersRegex: api_key
diff --git a/bin/configs/unmaintained/jaxrs-cxf-client-jackson.yaml b/bin/configs/unmaintained/jaxrs-cxf-client-jackson.yaml
index 86cb90696fe..2a2af81a0e1 100644
--- a/bin/configs/unmaintained/jaxrs-cxf-client-jackson.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf-client-jackson.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-cxf-client
outputDir: samples/client/petstore/jaxrs-cxf-client-jackson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
artifactId: jaxrs-cxf-jackson-petstore-client
jackson: "true"
diff --git a/bin/configs/unmaintained/jaxrs-cxf-client.yaml b/bin/configs/unmaintained/jaxrs-cxf-client.yaml
index 26faac332b8..1b3709b6263 100644
--- a/bin/configs/unmaintained/jaxrs-cxf-client.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf-client.yaml
@@ -1,6 +1,6 @@
generatorName: jaxrs-cxf-client
outputDir: samples/client/petstore/jaxrs-cxf-client
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
artifactId: jaxrs-cxf-petstore-client
diff --git a/bin/configs/unmaintained/jaxrs-cxf-extended-jaxrs-cxf-test-data.yaml b/bin/configs/unmaintained/jaxrs-cxf-extended-jaxrs-cxf-test-data.yaml
index c66a09deeeb..69aba82f537 100644
--- a/bin/configs/unmaintained/jaxrs-cxf-extended-jaxrs-cxf-test-data.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf-extended-jaxrs-cxf-test-data.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-cxf-extended
outputDir: samples/server/petstore/jaxrs-cxf-test-data
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf-ext
generateAliasAsModel: true
additionalProperties:
java8: "true"
diff --git a/bin/configs/unmaintained/jaxrs-cxf-non-spring-app.yaml b/bin/configs/unmaintained/jaxrs-cxf-non-spring-app.yaml
index b1f09c10810..b35b7e4743b 100644
--- a/bin/configs/unmaintained/jaxrs-cxf-non-spring-app.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf-non-spring-app.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-cxf
outputDir: samples/server/petstore/jaxrs-cxf-non-spring-app
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
artifactId: cxf-server-non-spring
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-cxf.yaml b/bin/configs/unmaintained/jaxrs-cxf.yaml
index 76c2b2108fc..4994db42a2a 100644
--- a/bin/configs/unmaintained/jaxrs-cxf.yaml
+++ b/bin/configs/unmaintained/jaxrs-cxf.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-cxf
outputDir: samples/server/petstore/jaxrs-cxf
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
hideGenerationTimestamp: "true"
serverPort: "8082"
diff --git a/bin/configs/unmaintained/jaxrs-jersey-jaxrs-datelib-j8.yaml b/bin/configs/unmaintained/jaxrs-jersey-jaxrs-datelib-j8.yaml
index 902a8abae0b..99fa2272c97 100644
--- a/bin/configs/unmaintained/jaxrs-jersey-jaxrs-datelib-j8.yaml
+++ b/bin/configs/unmaintained/jaxrs-jersey-jaxrs-datelib-j8.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-jersey
outputDir: samples/server/petstore/jaxrs-datelib-j8
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS
additionalProperties:
serializableModel: true
withXml: true
diff --git a/bin/configs/unmaintained/jaxrs-jersey-jersey1-useTags.yaml b/bin/configs/unmaintained/jaxrs-jersey-jersey1-useTags.yaml
index 98c76c0e451..6cab1ef94df 100644
--- a/bin/configs/unmaintained/jaxrs-jersey-jersey1-useTags.yaml
+++ b/bin/configs/unmaintained/jaxrs-jersey-jersey1-useTags.yaml
@@ -1,8 +1,8 @@
generatorName: jaxrs-jersey
outputDir: samples/server/petstore/jaxrs/jersey1-useTags
library: jersey1
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS
additionalProperties:
artifactId: jaxrs-jersey1-useTags
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-jersey-jersey1.yaml b/bin/configs/unmaintained/jaxrs-jersey-jersey1.yaml
index 8df27c59be7..3e7823d808b 100644
--- a/bin/configs/unmaintained/jaxrs-jersey-jersey1.yaml
+++ b/bin/configs/unmaintained/jaxrs-jersey-jersey1.yaml
@@ -1,8 +1,8 @@
generatorName: jaxrs-jersey
outputDir: samples/server/petstore/jaxrs/jersey1
library: jersey1
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS
additionalProperties:
artifactId: jaxrs-jersey1-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-jersey-jersey2-useTags.yaml b/bin/configs/unmaintained/jaxrs-jersey-jersey2-useTags.yaml
index 8a2d89b02f2..bd39d4989a0 100644
--- a/bin/configs/unmaintained/jaxrs-jersey-jersey2-useTags.yaml
+++ b/bin/configs/unmaintained/jaxrs-jersey-jersey2-useTags.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-jersey
outputDir: samples/server/petstore/jaxrs/jersey2-useTags
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS
additionalProperties:
artifactId: jaxrs-jersey2-useTags
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-jersey-jersey2.yaml b/bin/configs/unmaintained/jaxrs-jersey-jersey2.yaml
index 8345db9f397..2aa73837276 100644
--- a/bin/configs/unmaintained/jaxrs-jersey-jersey2.yaml
+++ b/bin/configs/unmaintained/jaxrs-jersey-jersey2.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-jersey
outputDir: samples/server/petstore/jaxrs/jersey2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS
additionalProperties:
artifactId: jaxrs-jersey-petstore-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-jersey.yaml b/bin/configs/unmaintained/jaxrs-jersey.yaml
index 81328a6de1b..71b93991912 100644
--- a/bin/configs/unmaintained/jaxrs-jersey.yaml
+++ b/bin/configs/unmaintained/jaxrs-jersey.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-jersey
outputDir: samples/server/petstore/jaxrs-jersey
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS
additionalProperties:
artifactId: openapiv3-jaxrs-jersey-petstore-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-resteasy-default.yaml b/bin/configs/unmaintained/jaxrs-resteasy-default.yaml
index e05f414253f..52c46f3b3c8 100644
--- a/bin/configs/unmaintained/jaxrs-resteasy-default.yaml
+++ b/bin/configs/unmaintained/jaxrs-resteasy-default.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-resteasy
outputDir: samples/server/petstore/jaxrs-resteasy/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/resteasy
additionalProperties:
hideGenerationTimestamp: "true"
implicitHeadersRegex: api_key
diff --git a/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-java8.yaml b/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-java8.yaml
index 5191921e8e6..a7cfb97d42c 100644
--- a/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-java8.yaml
+++ b/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-java8.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-resteasy-eap
outputDir: samples/server/petstore/jaxrs-resteasy/eap-java8
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/resteasy/eap
additionalProperties:
artifactId: jaxrs-resteasy-eap-java8-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-joda.yaml b/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-joda.yaml
index a985b866cd3..b43a9e008cb 100644
--- a/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-joda.yaml
+++ b/bin/configs/unmaintained/jaxrs-resteasy-eap-eap-joda.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-resteasy-eap
outputDir: samples/server/petstore/jaxrs-resteasy/eap-joda
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/resteasy/eap
additionalProperties:
artifactId: jaxrs-resteasy-eap-joda-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-resteasy-eap-eap.yaml b/bin/configs/unmaintained/jaxrs-resteasy-eap-eap.yaml
index 5f776839cab..e157a06515b 100644
--- a/bin/configs/unmaintained/jaxrs-resteasy-eap-eap.yaml
+++ b/bin/configs/unmaintained/jaxrs-resteasy-eap-eap.yaml
@@ -1,6 +1,6 @@
generatorName: jaxrs-resteasy-eap
outputDir: samples/server/petstore/jaxrs-resteasy/eap
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/resteasy/eap
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-resteasy-java8.yaml b/bin/configs/unmaintained/jaxrs-resteasy-java8.yaml
index bf23076f8c8..b46cc46fc49 100644
--- a/bin/configs/unmaintained/jaxrs-resteasy-java8.yaml
+++ b/bin/configs/unmaintained/jaxrs-resteasy-java8.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-resteasy
outputDir: samples/server/petstore/jaxrs-resteasy/java8
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/resteasy
additionalProperties:
artifactId: jaxrs-resteasy-java8-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-resteasy-joda.yaml b/bin/configs/unmaintained/jaxrs-resteasy-joda.yaml
index 13fb6b8b671..cd1921f4d1b 100644
--- a/bin/configs/unmaintained/jaxrs-resteasy-joda.yaml
+++ b/bin/configs/unmaintained/jaxrs-resteasy-joda.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-resteasy
outputDir: samples/server/petstore/jaxrs-resteasy/joda
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/resteasy
additionalProperties:
artifactId: jaxrs-resteasy-joda-server
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/jaxrs-spec-interface-response.yaml b/bin/configs/unmaintained/jaxrs-spec-interface-response.yaml
index 3e4b7edfb93..233e9612a44 100644
--- a/bin/configs/unmaintained/jaxrs-spec-interface-response.yaml
+++ b/bin/configs/unmaintained/jaxrs-spec-interface-response.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-spec
outputDir: samples/server/petstore/jaxrs-spec-interface-response
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/spec
additionalProperties:
artifactId: jaxrs-spec-interface-response-petstore-server
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/jaxrs-spec-interface.yaml b/bin/configs/unmaintained/jaxrs-spec-interface.yaml
index 57a5034b273..72189e34cb2 100644
--- a/bin/configs/unmaintained/jaxrs-spec-interface.yaml
+++ b/bin/configs/unmaintained/jaxrs-spec-interface.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-spec
outputDir: samples/server/petstore/jaxrs-spec-interface
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/spec
additionalProperties:
artifactId: jaxrs-spec-interface-petstore-server
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/jaxrs-spec.yaml b/bin/configs/unmaintained/jaxrs-spec.yaml
index dbbb86bb420..4c6b04948b0 100644
--- a/bin/configs/unmaintained/jaxrs-spec.yaml
+++ b/bin/configs/unmaintained/jaxrs-spec.yaml
@@ -1,7 +1,7 @@
generatorName: jaxrs-spec
outputDir: samples/server/petstore/jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/spec
additionalProperties:
artifactId: jaxrs-spec-petstore-server
serializableModel: "true"
diff --git a/bin/configs/unmaintained/jmeter.yaml b/bin/configs/unmaintained/jmeter.yaml
index 79b5de0e41b..eacbbd4701e 100644
--- a/bin/configs/unmaintained/jmeter.yaml
+++ b/bin/configs/unmaintained/jmeter.yaml
@@ -1,4 +1,4 @@
generatorName: jmeter
outputDir: samples/client/petstore/jmeter
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/jmeter-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/jmeter-client
diff --git a/bin/configs/unmaintained/k6.yaml b/bin/configs/unmaintained/k6.yaml
index 9933744e314..bb51dd0be88 100644
--- a/bin/configs/unmaintained/k6.yaml
+++ b/bin/configs/unmaintained/k6.yaml
@@ -1,6 +1,6 @@
generatorName: k6
outputDir: samples/client/petstore/k6
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/k6
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/k6
additionalProperties:
appName: PetstoreClient
diff --git a/bin/configs/unmaintained/kotlin-allOff-discriminator.yaml b/bin/configs/unmaintained/kotlin-allOff-discriminator.yaml
index 0de0dd1e429..21d3024463d 100644
--- a/bin/configs/unmaintained/kotlin-allOff-discriminator.yaml
+++ b/bin/configs/unmaintained/kotlin-allOff-discriminator.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-allOff-discriminator
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10792.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10792.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-allOff-discriminator
serializableModel: "false"
diff --git a/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp3.yaml b/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp3.yaml
index d24f50303a1..6e0319999b4 100644
--- a/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp3.yaml
+++ b/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp3.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-array-simple-string-jvm-okhttp3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-array-simple-string-jvm-okhttp3
library: jvm-okhttp3
diff --git a/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp4.yaml b/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp4.yaml
index 53e16ff7c1f..4261259fbf2 100644
--- a/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp4.yaml
+++ b/bin/configs/unmaintained/kotlin-array-simple-string-jvm-okhttp4.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-array-simple-string-jvm-okhttp4
library: jvm-okhttp4
diff --git a/bin/configs/unmaintained/kotlin-array-simple-string-jvm-volley.yaml b/bin/configs/unmaintained/kotlin-array-simple-string-jvm-volley.yaml
index 88f6304907c..15934cb6c63 100644
--- a/bin/configs/unmaintained/kotlin-array-simple-string-jvm-volley.yaml
+++ b/bin/configs/unmaintained/kotlin-array-simple-string-jvm-volley.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-array-simple-string-jvm-volley
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-array-simple-string-jvm-volley
library: jvm-volley
diff --git a/bin/configs/unmaintained/kotlin-array-simple-string-multiplatform.yaml b/bin/configs/unmaintained/kotlin-array-simple-string-multiplatform.yaml
index 8c880a67971..728305aa086 100644
--- a/bin/configs/unmaintained/kotlin-array-simple-string-multiplatform.yaml
+++ b/bin/configs/unmaintained/kotlin-array-simple-string-multiplatform.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-array-simple-string-multiplatform
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-array-simple-string-multiplatform
library: multiplatform
diff --git a/bin/configs/unmaintained/kotlin-bigdecimal-default-multiplatform.yaml b/bin/configs/unmaintained/kotlin-bigdecimal-default-multiplatform.yaml
index c525b0b9edc..a0ab6039994 100644
--- a/bin/configs/unmaintained/kotlin-bigdecimal-default-multiplatform.yaml
+++ b/bin/configs/unmaintained/kotlin-bigdecimal-default-multiplatform.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-bigdecimal-default-multiplatform
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-bigdecimal-default-multiplatform
library: multiplatform
diff --git a/bin/configs/unmaintained/kotlin-bigdecimal-default-okhttp4.yaml b/bin/configs/unmaintained/kotlin-bigdecimal-default-okhttp4.yaml
index bceaf195f8f..72f5c88f152 100644
--- a/bin/configs/unmaintained/kotlin-bigdecimal-default-okhttp4.yaml
+++ b/bin/configs/unmaintained/kotlin-bigdecimal-default-okhttp4.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-bigdecimal-default-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-bigdecimal-default-okhttp4
library: jvm-okhttp4
diff --git a/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp3.yaml b/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp3.yaml
index 7b6aa2e9687..d1d552e8c4b 100644
--- a/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp3.yaml
+++ b/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp3.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-default-values-jvm-okhttp3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10865_default_values.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-default-values-jvm-okhttp3
library: jvm-okhttp3
diff --git a/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp4.yaml b/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp4.yaml
index 022c3cab534..2666192a649 100644
--- a/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp4.yaml
+++ b/bin/configs/unmaintained/kotlin-default-values-jvm-okhttp4.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-default-values-jvm-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10865_default_values.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-default-values-jvm-okhttp4
library: jvm-okhttp4
diff --git a/bin/configs/unmaintained/kotlin-default-values-jvm-retrofit2.yaml b/bin/configs/unmaintained/kotlin-default-values-jvm-retrofit2.yaml
index eca953c3f51..1e15c19891c 100644
--- a/bin/configs/unmaintained/kotlin-default-values-jvm-retrofit2.yaml
+++ b/bin/configs/unmaintained/kotlin-default-values-jvm-retrofit2.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-default-values-jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10865_default_values.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-default-values-jvm-retrofit2
library: jvm-retrofit2
diff --git a/bin/configs/unmaintained/kotlin-default-values-jvm-volley.yaml b/bin/configs/unmaintained/kotlin-default-values-jvm-volley.yaml
index d885b30356d..de49ef52c82 100644
--- a/bin/configs/unmaintained/kotlin-default-values-jvm-volley.yaml
+++ b/bin/configs/unmaintained/kotlin-default-values-jvm-volley.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-default-values-jvm-volley
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10865_default_values.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-default-values-jvm-volley
library: jvm-volley
diff --git a/bin/configs/unmaintained/kotlin-default-values-multiplatform.yaml b/bin/configs/unmaintained/kotlin-default-values-multiplatform.yaml
index 7a9a0fa52e6..09074f4743b 100644
--- a/bin/configs/unmaintained/kotlin-default-values-multiplatform.yaml
+++ b/bin/configs/unmaintained/kotlin-default-values-multiplatform.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-default-values-multiplatform
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10865_default_values.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-default-values-multiplatform
library: multiplatform
diff --git a/bin/configs/unmaintained/kotlin-default-values-numbers.yaml b/bin/configs/unmaintained/kotlin-default-values-numbers.yaml
index 1a76dd1dfde..17815661f81 100644
--- a/bin/configs/unmaintained/kotlin-default-values-numbers.yaml
+++ b/bin/configs/unmaintained/kotlin-default-values-numbers.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-default-values-numbers
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-default-values-numbers
serializationLibrary: gson
diff --git a/bin/configs/unmaintained/kotlin-enum-default-value.yaml b/bin/configs/unmaintained/kotlin-enum-default-value.yaml
index ddb00c55283..a8a4e997808 100644
--- a/bin/configs/unmaintained/kotlin-enum-default-value.yaml
+++ b/bin/configs/unmaintained/kotlin-enum-default-value.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-enum-default-value
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-enum-default-value
serializableModel: "true"
diff --git a/bin/configs/unmaintained/kotlin-gson.yaml b/bin/configs/unmaintained/kotlin-gson.yaml
index e4e55689509..67bd0ce2e81 100644
--- a/bin/configs/unmaintained/kotlin-gson.yaml
+++ b/bin/configs/unmaintained/kotlin-gson.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-gson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: gson
artifactId: kotlin-petstore-gson
diff --git a/bin/configs/unmaintained/kotlin-jackson.yaml b/bin/configs/unmaintained/kotlin-jackson.yaml
index 2d37a29f38a..1f3aa121ec7 100644
--- a/bin/configs/unmaintained/kotlin-jackson.yaml
+++ b/bin/configs/unmaintained/kotlin-jackson.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-jackson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: jackson
artifactId: kotlin-petstore-jackson
diff --git a/bin/configs/unmaintained/kotlin-json-request-string.yaml b/bin/configs/unmaintained/kotlin-json-request-string.yaml
index 31943045ab6..8d98a0f9903 100644
--- a/bin/configs/unmaintained/kotlin-json-request-string.yaml
+++ b/bin/configs/unmaintained/kotlin-json-request-string.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-json-request-string
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-date-field.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-date-field.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
requestDateConverter: toString
artifactId: kotlin-petstore-json-request-string
diff --git a/bin/configs/unmaintained/kotlin-jvm-ktor-gson.yaml b/bin/configs/unmaintained/kotlin-jvm-ktor-gson.yaml
index 6b8bd62f644..561f2abeaf4 100644
--- a/bin/configs/unmaintained/kotlin-jvm-ktor-gson.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-ktor-gson.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-jvm-ktor-gson
library: jvm-ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-jvm-ktor-gson
enumUnknownDefaultCase: true
diff --git a/bin/configs/unmaintained/kotlin-jvm-ktor-jackson.yaml b/bin/configs/unmaintained/kotlin-jvm-ktor-jackson.yaml
index 5fc856c88df..abe6877042d 100644
--- a/bin/configs/unmaintained/kotlin-jvm-ktor-jackson.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-ktor-jackson.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-jvm-ktor-jackson
library: jvm-ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-jvm-ktor-jackson
enumUnknownDefaultCase: true
diff --git a/bin/configs/unmaintained/kotlin-jvm-okhttp3-okhttp3.yaml b/bin/configs/unmaintained/kotlin-jvm-okhttp3-okhttp3.yaml
index 13baa85c9a6..4a9dee38f67 100644
--- a/bin/configs/unmaintained/kotlin-jvm-okhttp3-okhttp3.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-okhttp3-okhttp3.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-okhttp3
library: jvm-okhttp3
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-okhttp3
enumUnknownDefaultCase: true
diff --git a/bin/configs/unmaintained/kotlin-jvm-okhttp4-coroutines.yaml b/bin/configs/unmaintained/kotlin-jvm-okhttp4-coroutines.yaml
index 0718c164d56..3dfc6cedcb0 100644
--- a/bin/configs/unmaintained/kotlin-jvm-okhttp4-coroutines.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-okhttp4-coroutines.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-jvm-okhttp4-coroutines
library: jvm-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: gson
useCoroutines: "true"
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-coroutines.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-coroutines.yaml
index b401e273723..f44c8d22385 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-coroutines.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-coroutines.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: gson
useCoroutines: "true"
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-kotlinx_serialization.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-kotlinx_serialization.yaml
index f54496d25f1..977624043e2 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-kotlinx_serialization.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-kotlinx_serialization.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-retrofit2-kotlinx_serialization
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: kotlinx_serialization
artifactId: kotlin-petstore-retrofit2-kotlinx_serialization
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-retrofit2.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-retrofit2.yaml
index 0729bf8ecd8..339b171cb3a 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-retrofit2.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-retrofit2.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-retrofit2
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-retrofit2
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx.yaml
index 882aa38c7c5..eef96c14455 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: gson
useRxJava: "true"
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2-kotlinx_serialization.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2-kotlinx_serialization.yaml
index afd9f324186..23cda2462ce 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2-kotlinx_serialization.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2-kotlinx_serialization.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2-kotlinx_serialization
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: kotlinx_serialization
useRxJava2: "true"
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2.yaml
index 2332ff3be1f..b4349b65d4c 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx2.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: gson
useRxJava2: "true"
diff --git a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx3.yaml b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx3.yaml
index 06284f2fa24..e37add02caa 100644
--- a/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx3.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-retrofit2-rx3.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-retrofit2-rx3
library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-retrofit2-rx3
useRxJava3: "true"
diff --git a/bin/configs/unmaintained/kotlin-jvm-volley.yaml b/bin/configs/unmaintained/kotlin-jvm-volley.yaml
index cdb8ac51a9b..fdeee4aef5d 100644
--- a/bin/configs/unmaintained/kotlin-jvm-volley.yaml
+++ b/bin/configs/unmaintained/kotlin-jvm-volley.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-jvm-volley
library: jvm-volley
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-jvm-volley
generateRoomModels: "true"
diff --git a/bin/configs/unmaintained/kotlin-modelMutable.yaml b/bin/configs/unmaintained/kotlin-modelMutable.yaml
index 584224804ed..2f826fe805a 100644
--- a/bin/configs/unmaintained/kotlin-modelMutable.yaml
+++ b/bin/configs/unmaintained/kotlin-modelMutable.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-modelMutable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-modelMutable
modelMutable: "true"
diff --git a/bin/configs/unmaintained/kotlin-moshi-codegen.yaml b/bin/configs/unmaintained/kotlin-moshi-codegen.yaml
index 00536bbf1cf..4ac46de4525 100644
--- a/bin/configs/unmaintained/kotlin-moshi-codegen.yaml
+++ b/bin/configs/unmaintained/kotlin-moshi-codegen.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-moshi-codegen
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
serializationLibrary: moshi
artifactId: kotlin-petstore-moshi-codegen
diff --git a/bin/configs/unmaintained/kotlin-multiplatform.yaml b/bin/configs/unmaintained/kotlin-multiplatform.yaml
index ba50f38f678..aa7daba743a 100644
--- a/bin/configs/unmaintained/kotlin-multiplatform.yaml
+++ b/bin/configs/unmaintained/kotlin-multiplatform.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-multiplatform
library: multiplatform
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-client-petstore-multiplatform
diff --git a/bin/configs/unmaintained/kotlin-nonpublic.yaml b/bin/configs/unmaintained/kotlin-nonpublic.yaml
index fbc64ceb00d..76deef93958 100644
--- a/bin/configs/unmaintained/kotlin-nonpublic.yaml
+++ b/bin/configs/unmaintained/kotlin-nonpublic.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-nonpublic
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
nonPublicApi: "true"
artifactId: kotlin-petstore-nonpublic
diff --git a/bin/configs/unmaintained/kotlin-nullable.yaml b/bin/configs/unmaintained/kotlin-nullable.yaml
index 27fe5c6b0d8..295d3f735b6 100644
--- a/bin/configs/unmaintained/kotlin-nullable.yaml
+++ b/bin/configs/unmaintained/kotlin-nullable.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-nullable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-nullable
serializableModel: "true"
diff --git a/bin/configs/unmaintained/kotlin-server-jaxrs-spec.yaml b/bin/configs/unmaintained/kotlin-server-jaxrs-spec.yaml
index 11d4fcec7a8..f7fc70a5f83 100644
--- a/bin/configs/unmaintained/kotlin-server-jaxrs-spec.yaml
+++ b/bin/configs/unmaintained/kotlin-server-jaxrs-spec.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin-server
outputDir: samples/server/petstore/kotlin-server/jaxrs-spec
library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-server
additionalProperties:
useCoroutines: "true"
diff --git a/bin/configs/unmaintained/kotlin-server-ktor.yaml b/bin/configs/unmaintained/kotlin-server-ktor.yaml
index ad5bce1047e..eefb12a080e 100644
--- a/bin/configs/unmaintained/kotlin-server-ktor.yaml
+++ b/bin/configs/unmaintained/kotlin-server-ktor.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-server
outputDir: samples/server/petstore/kotlin-server/ktor
library: ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-server
additionalProperties:
hideGenerationTimestamp: "true"
serializableModel: "true"
diff --git a/bin/configs/unmaintained/kotlin-server-modelMutable.yaml b/bin/configs/unmaintained/kotlin-server-modelMutable.yaml
index 1af6d3edb62..4e6de035ece 100644
--- a/bin/configs/unmaintained/kotlin-server-modelMutable.yaml
+++ b/bin/configs/unmaintained/kotlin-server-modelMutable.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-server
outputDir: samples/server/petstore/kotlin-server-modelMutable
library: ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-server
additionalProperties:
hideGenerationTimestamp: "true"
modelMutable: "true"
diff --git a/bin/configs/unmaintained/kotlin-spring-boot-delegate.yaml b/bin/configs/unmaintained/kotlin-spring-boot-delegate.yaml
index 56adfb9f46c..a9da474ce3c 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot-delegate.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot-delegate.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot-delegate
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: springdoc
annotationLibrary: swagger2
diff --git a/bin/configs/unmaintained/kotlin-spring-boot-modelMutable.yaml b/bin/configs/unmaintained/kotlin-spring-boot-modelMutable.yaml
index 6a75dc2d04a..26acb8c936f 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot-modelMutable.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot-modelMutable.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot-modelMutable
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: springdoc
annotationLibrary: swagger2
diff --git a/bin/configs/unmaintained/kotlin-spring-boot-reactive.yaml b/bin/configs/unmaintained/kotlin-spring-boot-reactive.yaml
index f9a3f199679..1012c40c4d0 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot-reactive.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot-reactive.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot-reactive
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: springdoc
annotationLibrary: swagger2
diff --git a/bin/configs/unmaintained/kotlin-spring-boot-source-swagger1.yaml b/bin/configs/unmaintained/kotlin-spring-boot-source-swagger1.yaml
index 5f877b6c9a1..0e53e5521eb 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot-source-swagger1.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot-source-swagger1.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot-source-swagger1
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: source
annotationLibrary: swagger1
diff --git a/bin/configs/unmaintained/kotlin-spring-boot-source-swagger2.yaml b/bin/configs/unmaintained/kotlin-spring-boot-source-swagger2.yaml
index bd08d444d47..8e1671e3520 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot-source-swagger2.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot-source-swagger2.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot-source-swagger2
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: source
annotationLibrary: swagger2
diff --git a/bin/configs/unmaintained/kotlin-spring-boot-springfox.yaml b/bin/configs/unmaintained/kotlin-spring-boot-springfox.yaml
index 9e0bc3e274c..f7f375894eb 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot-springfox.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot-springfox.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot-springfox
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: springfox
annotationLibrary: swagger1
diff --git a/bin/configs/unmaintained/kotlin-spring-boot.yaml b/bin/configs/unmaintained/kotlin-spring-boot.yaml
index e727be7ebdf..33ca6a04788 100644
--- a/bin/configs/unmaintained/kotlin-spring-boot.yaml
+++ b/bin/configs/unmaintained/kotlin-spring-boot.yaml
@@ -1,8 +1,8 @@
generatorName: kotlin-spring
outputDir: samples/server/petstore/kotlin-springboot
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-spring
additionalProperties:
documentationProvider: none
annotationLibrary: none
diff --git a/bin/configs/unmaintained/kotlin-string.yaml b/bin/configs/unmaintained/kotlin-string.yaml
index e6cd63e4b40..0b3a53fd048 100644
--- a/bin/configs/unmaintained/kotlin-string.yaml
+++ b/bin/configs/unmaintained/kotlin-string.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-string
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-string
serializableModel: "true"
diff --git a/bin/configs/unmaintained/kotlin-threetenbp.yaml b/bin/configs/unmaintained/kotlin-threetenbp.yaml
index 02c900e8e03..7ec1edc4f4e 100644
--- a/bin/configs/unmaintained/kotlin-threetenbp.yaml
+++ b/bin/configs/unmaintained/kotlin-threetenbp.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-threetenbp
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-threetenbp
dateLibrary: threetenbp
diff --git a/bin/configs/unmaintained/kotlin-uppercase-enum.yaml b/bin/configs/unmaintained/kotlin-uppercase-enum.yaml
index f4066ef7db9..727a19c4ebb 100644
--- a/bin/configs/unmaintained/kotlin-uppercase-enum.yaml
+++ b/bin/configs/unmaintained/kotlin-uppercase-enum.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin-uppercase-enum
-inputSpec: modules/openapi-generator/src/test/resources/3_0/issue-4062.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/issue-4062.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-uppercase-enum
enumPropertyNaming: UPPERCASE
diff --git a/bin/configs/unmaintained/kotlin-vertx-modelMutable.yaml b/bin/configs/unmaintained/kotlin-vertx-modelMutable.yaml
index 2f61ae3ba9a..9bb176694ed 100644
--- a/bin/configs/unmaintained/kotlin-vertx-modelMutable.yaml
+++ b/bin/configs/unmaintained/kotlin-vertx-modelMutable.yaml
@@ -1,6 +1,6 @@
generatorName: kotlin-vertx
outputDir: samples/server/petstore/kotlin-vertx-modelMutable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-vertx-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-vertx-server
additionalProperties:
modelMutable: "true"
diff --git a/bin/configs/unmaintained/kotlin-vertx-vertx.yaml b/bin/configs/unmaintained/kotlin-vertx-vertx.yaml
index 64efa733325..f19d8efec09 100644
--- a/bin/configs/unmaintained/kotlin-vertx-vertx.yaml
+++ b/bin/configs/unmaintained/kotlin-vertx-vertx.yaml
@@ -1,6 +1,6 @@
generatorName: kotlin-vertx
outputDir: samples/server/petstore/kotlin/vertx
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-vertx-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-vertx-server
additionalProperties:
modelMutable: "false"
diff --git a/bin/configs/unmaintained/kotlin.yaml b/bin/configs/unmaintained/kotlin.yaml
index 136fff6480d..fe5d12e879d 100644
--- a/bin/configs/unmaintained/kotlin.yaml
+++ b/bin/configs/unmaintained/kotlin.yaml
@@ -1,7 +1,7 @@
generatorName: kotlin
outputDir: samples/client/petstore/kotlin
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/kotlin-client
additionalProperties:
artifactId: kotlin-petstore-client
serializableModel: "true"
diff --git a/bin/configs/unmaintained/ktorm-schema-modelMutable.yaml b/bin/configs/unmaintained/ktorm-schema-modelMutable.yaml
index dc63925fbad..89b5b0e4b8b 100644
--- a/bin/configs/unmaintained/ktorm-schema-modelMutable.yaml
+++ b/bin/configs/unmaintained/ktorm-schema-modelMutable.yaml
@@ -1,8 +1,8 @@
generatorName: ktorm-schema
outputDir: samples/schema/petstore/ktorm-modelMutable
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ktorm-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ktorm-schema
additionalProperties:
hideGenerationTimestamp: true
- importModelPackageName: org.openapitools.client.models
+ importModelPackageName: org.openapijsonschematools.client.models
modelMutable: "true"
diff --git a/bin/configs/unmaintained/ktorm-schema.yaml b/bin/configs/unmaintained/ktorm-schema.yaml
index d3c5beb9a33..ed227055c2b 100644
--- a/bin/configs/unmaintained/ktorm-schema.yaml
+++ b/bin/configs/unmaintained/ktorm-schema.yaml
@@ -1,7 +1,7 @@
generatorName: ktorm-schema
outputDir: samples/schema/petstore/ktorm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ktorm-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ktorm-schema
additionalProperties:
hideGenerationTimestamp: true
- importModelPackageName: org.openapitools.client.models
+ importModelPackageName: org.openapijsonschematools.client.models
diff --git a/bin/configs/unmaintained/lua.yaml b/bin/configs/unmaintained/lua.yaml
index 280cf32e741..34b15caf22c 100644
--- a/bin/configs/unmaintained/lua.yaml
+++ b/bin/configs/unmaintained/lua.yaml
@@ -1,6 +1,6 @@
generatorName: lua
outputDir: samples/client/petstore/lua
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/lua
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/lua
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/markdown.yaml b/bin/configs/unmaintained/markdown.yaml
index 9b490267160..34324ea5c0f 100644
--- a/bin/configs/unmaintained/markdown.yaml
+++ b/bin/configs/unmaintained/markdown.yaml
@@ -1,4 +1,4 @@
generatorName: markdown
outputDir: samples/documentation/markdown
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/markdown-documentation
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/markdown-documentation
diff --git a/bin/configs/unmaintained/mysql-schema-mysql.yaml b/bin/configs/unmaintained/mysql-schema-mysql.yaml
index 4a4811ae106..a69bbf4f5f3 100644
--- a/bin/configs/unmaintained/mysql-schema-mysql.yaml
+++ b/bin/configs/unmaintained/mysql-schema-mysql.yaml
@@ -1,4 +1,4 @@
generatorName: mysql-schema
outputDir: samples/schema/petstore/mysql
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/mysql-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/mysql-schema
diff --git a/bin/configs/unmaintained/nim.yaml b/bin/configs/unmaintained/nim.yaml
index 13a27a6b764..9a47bda0cd7 100644
--- a/bin/configs/unmaintained/nim.yaml
+++ b/bin/configs/unmaintained/nim.yaml
@@ -1,6 +1,6 @@
generatorName: nim
outputDir: samples/client/petstore/nim
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/nim-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/nim-client
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/nodejs-express-server.yaml b/bin/configs/unmaintained/nodejs-express-server.yaml
index 96c577ffacb..7c03537bdd3 100644
--- a/bin/configs/unmaintained/nodejs-express-server.yaml
+++ b/bin/configs/unmaintained/nodejs-express-server.yaml
@@ -1,4 +1,4 @@
generatorName: nodejs-express-server
outputDir: samples/server/petstore/nodejs-express-server
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/nodejs-express-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/nodejs-express-server
diff --git a/bin/configs/unmaintained/objc-core-data.yaml b/bin/configs/unmaintained/objc-core-data.yaml
index 7625d0934ce..e11912b55a8 100644
--- a/bin/configs/unmaintained/objc-core-data.yaml
+++ b/bin/configs/unmaintained/objc-core-data.yaml
@@ -1,7 +1,7 @@
generatorName: objc
outputDir: samples/client/petstore/objc/core-data
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
-templateDir: modules/openapi-generator/src/main/resources/objc
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.json
+templateDir: modules/openapi-json-schema-generator/src/main/resources/objc
additionalProperties:
classPrefix: SWG
podName: SwaggerClient
diff --git a/bin/configs/unmaintained/objc-default.yaml b/bin/configs/unmaintained/objc-default.yaml
index 5acc6b0c916..79c65dec6d9 100644
--- a/bin/configs/unmaintained/objc-default.yaml
+++ b/bin/configs/unmaintained/objc-default.yaml
@@ -1,7 +1,7 @@
generatorName: objc
outputDir: samples/client/petstore/objc/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
-templateDir: modules/openapi-generator/src/main/resources/objc
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.json
+templateDir: modules/openapi-json-schema-generator/src/main/resources/objc
additionalProperties:
classPrefix: SWG
podName: SwaggerClient
diff --git a/bin/configs/unmaintained/ocaml.yaml b/bin/configs/unmaintained/ocaml.yaml
index 1933d84fb7d..8fed8e2c568 100644
--- a/bin/configs/unmaintained/ocaml.yaml
+++ b/bin/configs/unmaintained/ocaml.yaml
@@ -1,6 +1,6 @@
generatorName: ocaml
outputDir: samples/client/petstore/ocaml
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ocaml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ocaml
additionalProperties:
packageName: petstore_client
diff --git a/bin/configs/unmaintained/openapi3/android-httpclient.yaml b/bin/configs/unmaintained/openapi3/android-httpclient.yaml
index e06c7a66fae..54d88753ad8 100644
--- a/bin/configs/unmaintained/openapi3/android-httpclient.yaml
+++ b/bin/configs/unmaintained/openapi3/android-httpclient.yaml
@@ -1,5 +1,5 @@
generatorName: android
outputDir: samples/client/petstore/android/httpclient
library: httpclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/android
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/android
diff --git a/bin/configs/unmaintained/openapi3/android-volley.yaml b/bin/configs/unmaintained/openapi3/android-volley.yaml
index eee8b0e3e33..349531da02a 100644
--- a/bin/configs/unmaintained/openapi3/android-volley.yaml
+++ b/bin/configs/unmaintained/openapi3/android-volley.yaml
@@ -1,7 +1,7 @@
generatorName: android
outputDir: samples/client/petstore/android/volley
library: volley
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/android
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/android
additionalProperties:
artifactId: petstore-android-volley
diff --git a/bin/configs/unmaintained/openapi3/avro-schema.yaml b/bin/configs/unmaintained/openapi3/avro-schema.yaml
index bf44846dc07..2661d6af222 100644
--- a/bin/configs/unmaintained/openapi3/avro-schema.yaml
+++ b/bin/configs/unmaintained/openapi3/avro-schema.yaml
@@ -1,4 +1,4 @@
generatorName: avro-schema
outputDir: samples/openapi3/schema/petstore/avro-schema
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/avro-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/avro-schema
diff --git a/bin/configs/unmaintained/openapi3/bash.yaml b/bin/configs/unmaintained/openapi3/bash.yaml
index 04de158b3fc..8fff5343d72 100644
--- a/bin/configs/unmaintained/openapi3/bash.yaml
+++ b/bin/configs/unmaintained/openapi3/bash.yaml
@@ -1,7 +1,7 @@
generatorName: bash
outputDir: samples/client/petstore/bash
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/bash
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/bash
additionalProperties:
generateZshCompletion: true
hostEnvironmentVariable: PETSTORE_HOST
diff --git a/bin/configs/unmaintained/openapi3/clojure.yaml b/bin/configs/unmaintained/openapi3/clojure.yaml
index 3c526d5ac10..bd5f3a20d29 100644
--- a/bin/configs/unmaintained/openapi3/clojure.yaml
+++ b/bin/configs/unmaintained/openapi3/clojure.yaml
@@ -1,4 +1,4 @@
generatorName: clojure
outputDir: samples/client/petstore/clojure
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json
-templateDir: modules/openapi-generator/src/main/resources/clojure
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.json
+templateDir: modules/openapi-json-schema-generator/src/main/resources/clojure
diff --git a/bin/configs/unmaintained/openapi3/cpp-pistache-server-cpp-pistache.yaml b/bin/configs/unmaintained/openapi3/cpp-pistache-server-cpp-pistache.yaml
index 4faabff095d..a3610fead18 100644
--- a/bin/configs/unmaintained/openapi3/cpp-pistache-server-cpp-pistache.yaml
+++ b/bin/configs/unmaintained/openapi3/cpp-pistache-server-cpp-pistache.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-pistache-server
outputDir: samples/server/petstore/cpp-pistache
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-pistache-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-pistache-server
diff --git a/bin/configs/unmaintained/openapi3/cpp-qt5-client-cpp-qt5.yaml b/bin/configs/unmaintained/openapi3/cpp-qt5-client-cpp-qt5.yaml
index 904d99a7510..92cc7e9449a 100644
--- a/bin/configs/unmaintained/openapi3/cpp-qt5-client-cpp-qt5.yaml
+++ b/bin/configs/unmaintained/openapi3/cpp-qt5-client-cpp-qt5.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-qt5-client
outputDir: samples/client/petstore/cpp-qt5
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-qt5-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-qt5-client
diff --git a/bin/configs/unmaintained/openapi3/cpp-qt5-qhttpengine-server.yaml b/bin/configs/unmaintained/openapi3/cpp-qt5-qhttpengine-server.yaml
index 285c0d9d5dd..b8a217a8962 100644
--- a/bin/configs/unmaintained/openapi3/cpp-qt5-qhttpengine-server.yaml
+++ b/bin/configs/unmaintained/openapi3/cpp-qt5-qhttpengine-server.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-qt5-qhttpengine-server
outputDir: samples/client/petstore/cpp-qt5-qhttpengine-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-qt5-qhttpengine-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-qt5-qhttpengine-server
diff --git a/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed-deprecated.yaml b/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed-deprecated.yaml
index 8a9b93fffe8..fcca00b51e2 100644
--- a/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed-deprecated.yaml
+++ b/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed-deprecated.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-restbed-server-deprecated
outputDir: samples/server/petstore/cpp-restbed-deprecated
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server-deprecated
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-restbed-server-deprecated
diff --git a/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed.yaml b/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed.yaml
index 6dc3929ec08..5ec72950719 100644
--- a/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed.yaml
+++ b/bin/configs/unmaintained/openapi3/cpp-restbed-server-cpp-restbed.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-restbed-server
outputDir: samples/server/petstore/cpp-restbed/generated/3_0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-restbed-server
diff --git a/bin/configs/unmaintained/openapi3/cpp-tizen.yaml b/bin/configs/unmaintained/openapi3/cpp-tizen.yaml
index 4f8d0e2a8c5..9f853164f68 100644
--- a/bin/configs/unmaintained/openapi3/cpp-tizen.yaml
+++ b/bin/configs/unmaintained/openapi3/cpp-tizen.yaml
@@ -1,4 +1,4 @@
generatorName: cpp-tizen
outputDir: samples/client/petstore/cpp-tizen
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/cpp-tizen-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/cpp-tizen-client
diff --git a/bin/configs/unmaintained/openapi3/csharp-OpenAPIClient.yaml b/bin/configs/unmaintained/openapi3/csharp-OpenAPIClient.yaml
index 24a5fd2b5b3..d0263f5f694 100644
--- a/bin/configs/unmaintained/openapi3/csharp-OpenAPIClient.yaml
+++ b/bin/configs/unmaintained/openapi3/csharp-OpenAPIClient.yaml
@@ -1,6 +1,6 @@
generatorName: csharp
outputDir: samples/openapi3/client/petstore/csharp/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientNetStandard.yaml b/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientNetStandard.yaml
index e2dcfd8e9a2..e97b412cb12 100644
--- a/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientNetStandard.yaml
+++ b/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientNetStandard.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
targetFramework: netstandard1.3
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
diff --git a/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml b/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml
index 03034797145..aea9a2cbde2 100644
--- a/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml
+++ b/bin/configs/unmaintained/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml
@@ -1,7 +1,7 @@
generatorName: csharp
outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp
additionalProperties:
packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}'
generatePropertyChanged: "true"
diff --git a/bin/configs/unmaintained/openapi3/csharp-dotnet2-OpenAPIClient.yaml b/bin/configs/unmaintained/openapi3/csharp-dotnet2-OpenAPIClient.yaml
index 428ce87b8b9..58d0a84ced8 100644
--- a/bin/configs/unmaintained/openapi3/csharp-dotnet2-OpenAPIClient.yaml
+++ b/bin/configs/unmaintained/openapi3/csharp-dotnet2-OpenAPIClient.yaml
@@ -1,6 +1,6 @@
generatorName: csharp-dotnet2
outputDir: samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/csharp-dotnet2
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/csharp-dotnet2
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/openapi3/elixir.yaml b/bin/configs/unmaintained/openapi3/elixir.yaml
index 79dd519cb1b..dc3235a3347 100644
--- a/bin/configs/unmaintained/openapi3/elixir.yaml
+++ b/bin/configs/unmaintained/openapi3/elixir.yaml
@@ -1,4 +1,4 @@
generatorName: elixir
outputDir: samples/client/petstore/elixir
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/elixir
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/elixir
diff --git a/bin/configs/unmaintained/openapi3/go-gin-server-go-gin-api-server.yaml b/bin/configs/unmaintained/openapi3/go-gin-server-go-gin-api-server.yaml
index 81932e5d67a..7d0fe8d2dfd 100644
--- a/bin/configs/unmaintained/openapi3/go-gin-server-go-gin-api-server.yaml
+++ b/bin/configs/unmaintained/openapi3/go-gin-server-go-gin-api-server.yaml
@@ -1,7 +1,7 @@
generatorName: go-gin-server
outputDir: samples/openapi3/server/petstore/go-gin-api-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-gin-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-gin-server
additionalProperties:
hideGenerationTimestamp: "true"
packageName: petstoreserver
diff --git a/bin/configs/unmaintained/openapi3/go-petstore.yaml b/bin/configs/unmaintained/openapi3/go-petstore.yaml
index aefc71b9011..4ce5aaab2b1 100644
--- a/bin/configs/unmaintained/openapi3/go-petstore.yaml
+++ b/bin/configs/unmaintained/openapi3/go-petstore.yaml
@@ -1,7 +1,7 @@
generatorName: go
outputDir: samples/openapi3/client/petstore/go/go-petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/go
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go
additionalProperties:
enumClassPrefix: "true"
packageName: petstore
diff --git a/bin/configs/unmaintained/openapi3/go-server-go-api-server.yaml b/bin/configs/unmaintained/openapi3/go-server-go-api-server.yaml
index c5c85b26daa..41f603157be 100644
--- a/bin/configs/unmaintained/openapi3/go-server-go-api-server.yaml
+++ b/bin/configs/unmaintained/openapi3/go-server-go-api-server.yaml
@@ -1,7 +1,7 @@
generatorName: go-server
outputDir: samples/openapi3/server/petstore/go-api-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/go-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/go-server
additionalProperties:
hideGenerationTimestamp: "true"
packageName: petstoreserver
diff --git a/bin/configs/unmaintained/openapi3/graphql-nodejs-express-server.yaml b/bin/configs/unmaintained/openapi3/graphql-nodejs-express-server.yaml
index 52f9f68d239..b852ab8e797 100644
--- a/bin/configs/unmaintained/openapi3/graphql-nodejs-express-server.yaml
+++ b/bin/configs/unmaintained/openapi3/graphql-nodejs-express-server.yaml
@@ -1,6 +1,6 @@
generatorName: graphql-nodejs-express-server
outputDir: samples/server/petstore/graphql-nodejs-express-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/graphql-nodejs-express-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/graphql-nodejs-express-server
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/openapi3/haskell-http-client.yaml b/bin/configs/unmaintained/openapi3/haskell-http-client.yaml
index 7e16cbc5731..cb1d69a5caf 100644
--- a/bin/configs/unmaintained/openapi3/haskell-http-client.yaml
+++ b/bin/configs/unmaintained/openapi3/haskell-http-client.yaml
@@ -1,4 +1,4 @@
generatorName: haskell-http-client
outputDir: samples/client/petstore/haskell-http-client
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/haskell-http-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/haskell-http-client
diff --git a/bin/configs/unmaintained/openapi3/haskell-servant.yaml b/bin/configs/unmaintained/openapi3/haskell-servant.yaml
index 579db01c7f2..88bd670fb49 100644
--- a/bin/configs/unmaintained/openapi3/haskell-servant.yaml
+++ b/bin/configs/unmaintained/openapi3/haskell-servant.yaml
@@ -1,4 +1,4 @@
generatorName: haskell
outputDir: samples/server/petstore/haskell-servant
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/haskell-servant
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/haskell-servant
diff --git a/bin/configs/unmaintained/openapi3/javascript-closure-angular.yaml b/bin/configs/unmaintained/openapi3/javascript-closure-angular.yaml
index dd3caa461ec..6ebadc57b80 100644
--- a/bin/configs/unmaintained/openapi3/javascript-closure-angular.yaml
+++ b/bin/configs/unmaintained/openapi3/javascript-closure-angular.yaml
@@ -1,4 +1,4 @@
generatorName: javascript-closure-angular
outputDir: samples/client/petstore/javascript-closure-angular
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/Javascript-Closure-Angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/Javascript-Closure-Angular
diff --git a/bin/configs/unmaintained/openapi3/jaxrs-cxf-client-jackson-nullable.yaml b/bin/configs/unmaintained/openapi3/jaxrs-cxf-client-jackson-nullable.yaml
index c7e0393d752..d2604ee793a 100644
--- a/bin/configs/unmaintained/openapi3/jaxrs-cxf-client-jackson-nullable.yaml
+++ b/bin/configs/unmaintained/openapi3/jaxrs-cxf-client-jackson-nullable.yaml
@@ -1,6 +1,6 @@
generatorName: jaxrs-cxf-client
outputDir: samples/openapi3/client/petstore/jaxrs-cxf-client-jackson-nullable
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
jackson: "true"
\ No newline at end of file
diff --git a/bin/configs/unmaintained/openapi3/jaxrs-cxf-client.yaml b/bin/configs/unmaintained/openapi3/jaxrs-cxf-client.yaml
index 08cb8cd0a60..3902c9d721a 100644
--- a/bin/configs/unmaintained/openapi3/jaxrs-cxf-client.yaml
+++ b/bin/configs/unmaintained/openapi3/jaxrs-cxf-client.yaml
@@ -1,6 +1,6 @@
generatorName: jaxrs-cxf-client
outputDir: samples/client/petstore/jaxrs-cxf-client
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaJaxRS/cxf
additionalProperties:
artifactId: jaxrs-cxf-petstore-client
diff --git a/bin/configs/unmaintained/openapi3/php-laravel.yaml b/bin/configs/unmaintained/openapi3/php-laravel.yaml
index 3a405cc6736..5298ab22fbc 100644
--- a/bin/configs/unmaintained/openapi3/php-laravel.yaml
+++ b/bin/configs/unmaintained/openapi3/php-laravel.yaml
@@ -1,4 +1,4 @@
generatorName: php-laravel
outputDir: samples/server/petstore/php-laravel
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-laravel
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-laravel
diff --git a/bin/configs/unmaintained/openapi3/php-slim4.yaml b/bin/configs/unmaintained/openapi3/php-slim4.yaml
index a15c313a772..9e82f23efc1 100644
--- a/bin/configs/unmaintained/openapi3/php-slim4.yaml
+++ b/bin/configs/unmaintained/openapi3/php-slim4.yaml
@@ -1,4 +1,4 @@
generatorName: php-slim4
outputDir: samples/server/petstore/php-slim4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-slim4-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-slim4-server
diff --git a/bin/configs/unmaintained/openapi3/php-symfony-SymfonyBundle-php.yaml b/bin/configs/unmaintained/openapi3/php-symfony-SymfonyBundle-php.yaml
index ffb7015b650..925bba5f2d3 100644
--- a/bin/configs/unmaintained/openapi3/php-symfony-SymfonyBundle-php.yaml
+++ b/bin/configs/unmaintained/openapi3/php-symfony-SymfonyBundle-php.yaml
@@ -1,4 +1,4 @@
generatorName: php-symfony
outputDir: samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-symfony
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-symfony
diff --git a/bin/configs/unmaintained/openapi3/python-flask-python2.yaml b/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
index 407389d9121..4b70c823f57 100644
--- a/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
+++ b/bin/configs/unmaintained/openapi3/python-flask-python2.yaml
@@ -1,6 +1,6 @@
generatorName: python-flask
outputDir: samples/openapi3/server/petstore/python-flask-python2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-flask
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-flask
additionalProperties:
supportPython2: true
diff --git a/bin/configs/unmaintained/openapi3/python-flask.yaml b/bin/configs/unmaintained/openapi3/python-flask.yaml
index aaca56bc6ee..024356e7903 100644
--- a/bin/configs/unmaintained/openapi3/python-flask.yaml
+++ b/bin/configs/unmaintained/openapi3/python-flask.yaml
@@ -1,4 +1,4 @@
generatorName: python-flask
outputDir: samples/openapi3/server/petstore/python-flask
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-flask
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-flask
diff --git a/bin/configs/unmaintained/openapi3/r-R.yaml b/bin/configs/unmaintained/openapi3/r-R.yaml
index 61be8bc8f11..830ae33fd7c 100644
--- a/bin/configs/unmaintained/openapi3/r-R.yaml
+++ b/bin/configs/unmaintained/openapi3/r-R.yaml
@@ -1,6 +1,6 @@
generatorName: r
outputDir: samples/client/petstore/R
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/r
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/r
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/openapi3/rust.yaml b/bin/configs/unmaintained/openapi3/rust.yaml
index bb987820088..2154063108e 100644
--- a/bin/configs/unmaintained/openapi3/rust.yaml
+++ b/bin/configs/unmaintained/openapi3/rust.yaml
@@ -1,6 +1,6 @@
generatorName: rust
outputDir: samples/client/petstore/rust
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust
additionalProperties:
packageName: petstore_client
diff --git a/bin/configs/unmaintained/openapi3/scala-finch.yaml b/bin/configs/unmaintained/openapi3/scala-finch.yaml
index 3a9e69e674f..8ad535d4f71 100644
--- a/bin/configs/unmaintained/openapi3/scala-finch.yaml
+++ b/bin/configs/unmaintained/openapi3/scala-finch.yaml
@@ -1,4 +1,4 @@
generatorName: scala-finch
outputDir: samples/server/petstore/scala-finch
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-finch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-finch
diff --git a/bin/configs/unmaintained/openapi3/typescript-angular-default.yaml b/bin/configs/unmaintained/openapi3/typescript-angular-default.yaml
index 0fefcc8f6f3..b316bc17586 100644
--- a/bin/configs/unmaintained/openapi3/typescript-angular-default.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-angular-default.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 13.3.2
diff --git a/bin/configs/unmaintained/openapi3/typescript-angular-npm.yaml b/bin/configs/unmaintained/openapi3/typescript-angular-npm.yaml
index 4533bbcd6cb..c4e913c0d2d 100644
--- a/bin/configs/unmaintained/openapi3/typescript-angular-npm.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-angular-npm.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular/npm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
npmVersion: 0.0.1
ngVersion: 13.3.2
- npmName: '@openapitools/angular2-typescript-petstore'
+ npmName: '@openapijsonschematools/angular2-typescript-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/openapi3/typescript-angular-with-interfaces.yaml b/bin/configs/unmaintained/openapi3/typescript-angular-with-interfaces.yaml
index 2b860ba10b6..725e225860e 100644
--- a/bin/configs/unmaintained/openapi3/typescript-angular-with-interfaces.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-angular-with-interfaces.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular/with-interfaces
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
withInterfaces: "true"
ngVersion: 13.3.2
diff --git a/bin/configs/unmaintained/openapi3/typescript-aurelia-default.yaml b/bin/configs/unmaintained/openapi3/typescript-aurelia-default.yaml
index 070074e0f64..c9bca96e6ac 100644
--- a/bin/configs/unmaintained/openapi3/typescript-aurelia-default.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-aurelia-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-aurelia
outputDir: samples/client/petstore/typescript-aurelia/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-aurelia
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-aurelia
diff --git a/bin/configs/unmaintained/openapi3/typescript-fetch-default.yaml b/bin/configs/unmaintained/openapi3/typescript-fetch-default.yaml
index 3e7ffa489e8..f383b0ec912 100644
--- a/bin/configs/unmaintained/openapi3/typescript-fetch-default.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-fetch-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
diff --git a/bin/configs/unmaintained/openapi3/typescript-fetch-es6-target.yaml b/bin/configs/unmaintained/openapi3/typescript-fetch-es6-target.yaml
index 061f6290ab3..0c9db415e42 100644
--- a/bin/configs/unmaintained/openapi3/typescript-fetch-es6-target.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-fetch-es6-target.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/es6-target
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
supportsES6: true
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/openapi3/typescript-fetch-with-interfaces.yaml b/bin/configs/unmaintained/openapi3/typescript-fetch-with-interfaces.yaml
index 3e840041de8..0327f43c9f5 100644
--- a/bin/configs/unmaintained/openapi3/typescript-fetch-with-interfaces.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-fetch-with-interfaces.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/with-interfaces
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
withInterfaces: "true"
diff --git a/bin/configs/unmaintained/openapi3/typescript-fetch-with-npm-version.yaml b/bin/configs/unmaintained/openapi3/typescript-fetch-with-npm-version.yaml
index 7d00832abe1..c2dcca8082f 100644
--- a/bin/configs/unmaintained/openapi3/typescript-fetch-with-npm-version.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-fetch-with-npm-version.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/with-npm-version
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/openapi3/typescript-inversify.yaml b/bin/configs/unmaintained/openapi3/typescript-inversify.yaml
index 6e819934b68..30646061084 100644
--- a/bin/configs/unmaintained/openapi3/typescript-inversify.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-inversify.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-inversify
outputDir: samples/client/petstore/typescript-inversify
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-inversify
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-inversify
diff --git a/bin/configs/unmaintained/openapi3/typescript-jquery-default.yaml b/bin/configs/unmaintained/openapi3/typescript-jquery-default.yaml
index 70cd96bea35..eeae81f6178 100644
--- a/bin/configs/unmaintained/openapi3/typescript-jquery-default.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-jquery-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-jquery
outputDir: samples/client/petstore/typescript-jquery/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-jquery
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-jquery
diff --git a/bin/configs/unmaintained/openapi3/typescript-jquery-npm.yaml b/bin/configs/unmaintained/openapi3/typescript-jquery-npm.yaml
index 1b842c66aa6..1a45e61f48a 100644
--- a/bin/configs/unmaintained/openapi3/typescript-jquery-npm.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-jquery-npm.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-jquery
outputDir: samples/client/petstore/typescript-jquery/npm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-jquery
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-jquery
additionalProperties:
npmVersion: 0.0.1
- npmName: '@openapitools/jquery-typescript-petstore'
+ npmName: '@openapijsonschematools/jquery-typescript-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/openapi3/typescript-node-default.yaml b/bin/configs/unmaintained/openapi3/typescript-node-default.yaml
index 54db17e7328..536443fa3d6 100644
--- a/bin/configs/unmaintained/openapi3/typescript-node-default.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-node-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-node
outputDir: samples/client/petstore/typescript-node/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-node
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-node
diff --git a/bin/configs/unmaintained/openapi3/typescript-node-npm.yaml b/bin/configs/unmaintained/openapi3/typescript-node-npm.yaml
index 01d5cf687e5..ceb9bf36544 100644
--- a/bin/configs/unmaintained/openapi3/typescript-node-npm.yaml
+++ b/bin/configs/unmaintained/openapi3/typescript-node-npm.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-node
outputDir: samples/client/petstore/typescript-node/npm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-node
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-node
additionalProperties:
npmVersion: 0.0.1
- npmName: '@openapitools/angular2-typescript-petstore'
+ npmName: '@openapijsonschematools/angular2-typescript-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/perl-deep_module_test.yaml b/bin/configs/unmaintained/perl-deep_module_test.yaml
index ea9cd53d886..c8845e6b276 100644
--- a/bin/configs/unmaintained/perl-deep_module_test.yaml
+++ b/bin/configs/unmaintained/perl-deep_module_test.yaml
@@ -1,7 +1,7 @@
generatorName: perl
outputDir: samples/client/petstore/perl/deep_module_test
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/perl
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/perl
additionalProperties:
moduleName: Something::Deep
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/perl.yaml b/bin/configs/unmaintained/perl.yaml
index 17575b85be0..64c2fc09da5 100644
--- a/bin/configs/unmaintained/perl.yaml
+++ b/bin/configs/unmaintained/perl.yaml
@@ -1,6 +1,6 @@
generatorName: perl
outputDir: samples/client/petstore/perl
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/perl
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/perl
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/php-OpenAPIClient.yaml b/bin/configs/unmaintained/php-OpenAPIClient.yaml
index d3ce7bdae35..44c2bbd3289 100644
--- a/bin/configs/unmaintained/php-OpenAPIClient.yaml
+++ b/bin/configs/unmaintained/php-OpenAPIClient.yaml
@@ -1,4 +1,4 @@
generatorName: php
outputDir: samples/client/petstore/php/OpenAPIClient-php
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php
diff --git a/bin/configs/unmaintained/php-dt-modern.yaml b/bin/configs/unmaintained/php-dt-modern.yaml
index 33432079423..712f4187ce4 100644
--- a/bin/configs/unmaintained/php-dt-modern.yaml
+++ b/bin/configs/unmaintained/php-dt-modern.yaml
@@ -1,6 +1,6 @@
generatorName: php-dt
outputDir: samples/client/petstore/php-dt-modern
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-dt-modern
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-dt-modern
additionalProperties:
modern: "true"
diff --git a/bin/configs/unmaintained/php-dt.yaml b/bin/configs/unmaintained/php-dt.yaml
index 6e1cbcccc57..ea3041abb94 100644
--- a/bin/configs/unmaintained/php-dt.yaml
+++ b/bin/configs/unmaintained/php-dt.yaml
@@ -1,4 +1,4 @@
generatorName: php-dt
outputDir: samples/client/petstore/php-dt
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-dt
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-dt
diff --git a/bin/configs/unmaintained/php-laravel.yaml b/bin/configs/unmaintained/php-laravel.yaml
index 88d17374326..53ec7042d1d 100644
--- a/bin/configs/unmaintained/php-laravel.yaml
+++ b/bin/configs/unmaintained/php-laravel.yaml
@@ -1,6 +1,6 @@
generatorName: php-laravel
outputDir: samples/server/petstore/php-laravel
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-laravel
-gitUserId: openapitools
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-laravel
+gitUserId: openapijsonschematools
gitRepoId: petstore
diff --git a/bin/configs/unmaintained/php-lumen.yaml b/bin/configs/unmaintained/php-lumen.yaml
index 4436f9ba46d..63ee671f677 100644
--- a/bin/configs/unmaintained/php-lumen.yaml
+++ b/bin/configs/unmaintained/php-lumen.yaml
@@ -1,4 +1,4 @@
generatorName: php-lumen
outputDir: samples/server/petstore/php-lumen
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-lumen
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-lumen
diff --git a/bin/configs/unmaintained/php-mezzio-ph-modern.yaml b/bin/configs/unmaintained/php-mezzio-ph-modern.yaml
index accaa2dfe30..03e7c832290 100644
--- a/bin/configs/unmaintained/php-mezzio-ph-modern.yaml
+++ b/bin/configs/unmaintained/php-mezzio-ph-modern.yaml
@@ -1,6 +1,6 @@
generatorName: php-mezzio-ph
outputDir: samples/server/petstore/php-mezzio-ph-modern
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-mezzio-ph-modern
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-mezzio-ph-modern
additionalProperties:
modern: "true"
diff --git a/bin/configs/unmaintained/php-mezzio-ph.yaml b/bin/configs/unmaintained/php-mezzio-ph.yaml
index 614be6ce9fb..d5a792881b1 100644
--- a/bin/configs/unmaintained/php-mezzio-ph.yaml
+++ b/bin/configs/unmaintained/php-mezzio-ph.yaml
@@ -1,4 +1,4 @@
generatorName: php-mezzio-ph
outputDir: samples/server/petstore/php-mezzio-ph
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-mezzio-ph
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-mezzio-ph
diff --git a/bin/configs/unmaintained/php-slim4.yaml b/bin/configs/unmaintained/php-slim4.yaml
index a15c313a772..9e82f23efc1 100644
--- a/bin/configs/unmaintained/php-slim4.yaml
+++ b/bin/configs/unmaintained/php-slim4.yaml
@@ -1,4 +1,4 @@
generatorName: php-slim4
outputDir: samples/server/petstore/php-slim4
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-slim4-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-slim4-server
diff --git a/bin/configs/unmaintained/php-symfony-SymfonyBundle-php.yaml b/bin/configs/unmaintained/php-symfony-SymfonyBundle-php.yaml
index 45871b6da22..07db981a4aa 100644
--- a/bin/configs/unmaintained/php-symfony-SymfonyBundle-php.yaml
+++ b/bin/configs/unmaintained/php-symfony-SymfonyBundle-php.yaml
@@ -1,6 +1,6 @@
generatorName: php-symfony
outputDir: samples/server/petstore/php-symfony/SymfonyBundle-php
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/php-symfony
-gitUserId: openapitools
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/php-symfony
+gitUserId: openapijsonschematools
gitRepoId: petstore
diff --git a/bin/configs/unmaintained/plantuml.yaml b/bin/configs/unmaintained/plantuml.yaml
index 397fad4f643..77efbd42c27 100644
--- a/bin/configs/unmaintained/plantuml.yaml
+++ b/bin/configs/unmaintained/plantuml.yaml
@@ -1,4 +1,4 @@
generatorName: plantuml
outputDir: samples/documentation/petstore/plantuml
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/plantuml
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/plantuml
diff --git a/bin/configs/unmaintained/powershell.yaml b/bin/configs/unmaintained/powershell.yaml
index 9a408c2ad17..06810c97c95 100644
--- a/bin/configs/unmaintained/powershell.yaml
+++ b/bin/configs/unmaintained/powershell.yaml
@@ -1,7 +1,7 @@
generatorName: powershell
outputDir: samples/client/petstore/powershell
-inputSpec: modules/openapi-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/powershell
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/powershell
additionalProperties:
packageGuid: a27b908d-2a20-467f-bc32-af6f3a654ac5
commonVerbs: Delete=Remove:Patch=Update
diff --git a/bin/configs/unmaintained/protobuf-schema.yaml b/bin/configs/unmaintained/protobuf-schema.yaml
index 30f606c915f..556529d3407 100644
--- a/bin/configs/unmaintained/protobuf-schema.yaml
+++ b/bin/configs/unmaintained/protobuf-schema.yaml
@@ -1,6 +1,6 @@
generatorName: protobuf-schema
outputDir: samples/config/petstore/protobuf-schema
-inputSpec: modules/openapi-generator/src/test/resources/3_0/protobuf/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/protobuf-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/protobuf/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/protobuf-schema
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/python-aiohttp-srclayout.yaml b/bin/configs/unmaintained/python-aiohttp-srclayout.yaml
index d376bbf63b8..1d71f0315b1 100644
--- a/bin/configs/unmaintained/python-aiohttp-srclayout.yaml
+++ b/bin/configs/unmaintained/python-aiohttp-srclayout.yaml
@@ -1,6 +1,6 @@
generatorName: python-aiohttp
outputDir: samples/server/petstore/python-aiohttp-srclayout
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-aiohttp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-aiohttp
additionalProperties:
pythonSrcRoot: src
diff --git a/bin/configs/unmaintained/python-aiohttp.yaml b/bin/configs/unmaintained/python-aiohttp.yaml
index 2a10c592ae3..b7bb4647d8b 100644
--- a/bin/configs/unmaintained/python-aiohttp.yaml
+++ b/bin/configs/unmaintained/python-aiohttp.yaml
@@ -1,4 +1,4 @@
generatorName: python-aiohttp
outputDir: samples/server/petstore/python-aiohttp
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-aiohttp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-aiohttp
diff --git a/bin/configs/unmaintained/python-asyncio.yaml b/bin/configs/unmaintained/python-asyncio.yaml
index e0918c1d48d..9c3601ff430 100644
--- a/bin/configs/unmaintained/python-asyncio.yaml
+++ b/bin/configs/unmaintained/python-asyncio.yaml
@@ -1,7 +1,7 @@
generatorName: python-legacy
outputDir: samples/client/petstore/python-asyncio
library: asyncio
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-legacy
additionalProperties:
packageName: petstore_api
diff --git a/bin/configs/unmaintained/python-blueplanet.yaml b/bin/configs/unmaintained/python-blueplanet.yaml
index eb38af7fefd..eeed272acec 100644
--- a/bin/configs/unmaintained/python-blueplanet.yaml
+++ b/bin/configs/unmaintained/python-blueplanet.yaml
@@ -1,4 +1,4 @@
generatorName: python-blueplanet
outputDir: samples/server/petstore/python-blueplanet
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-blueplanet
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-blueplanet
diff --git a/bin/configs/unmaintained/python-fastapi.yaml b/bin/configs/unmaintained/python-fastapi.yaml
index fdba2dbe340..3cf26bc39f6 100644
--- a/bin/configs/unmaintained/python-fastapi.yaml
+++ b/bin/configs/unmaintained/python-fastapi.yaml
@@ -1,7 +1,7 @@
generatorName: python-fastapi
outputDir: samples/server/petstore/python-fastapi
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-fastapi
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-fastapi
sourceFolder: "src"
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/python-features-dynamic-servers.yaml b/bin/configs/unmaintained/python-features-dynamic-servers.yaml
index 6b154d3dd1c..423ee7824f2 100644
--- a/bin/configs/unmaintained/python-features-dynamic-servers.yaml
+++ b/bin/configs/unmaintained/python-features-dynamic-servers.yaml
@@ -1,6 +1,6 @@
generatorName: python
outputDir: samples/openapi3/client/features/dynamic-servers/python/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/features/dynamic-servers.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python
additionalProperties:
packageName: dynamic_servers
diff --git a/bin/configs/unmaintained/python-flask.yaml b/bin/configs/unmaintained/python-flask.yaml
index c8bc1d08f5d..caf64db63c3 100644
--- a/bin/configs/unmaintained/python-flask.yaml
+++ b/bin/configs/unmaintained/python-flask.yaml
@@ -1,4 +1,4 @@
generatorName: python-flask
outputDir: samples/server/petstore/python-flask
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-flask
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-flask
diff --git a/bin/configs/unmaintained/python-legacy-oas2.yaml b/bin/configs/unmaintained/python-legacy-oas2.yaml
index 14003ec2214..20d1da0f9de 100644
--- a/bin/configs/unmaintained/python-legacy-oas2.yaml
+++ b/bin/configs/unmaintained/python-legacy-oas2.yaml
@@ -1,6 +1,6 @@
generatorName: python-legacy
outputDir: samples/client/petstore/python-legacy
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-legacy
additionalProperties:
packageName: petstore_api
diff --git a/bin/configs/unmaintained/python-legacy.yaml b/bin/configs/unmaintained/python-legacy.yaml
index 58657e4891a..35f86c21173 100644
--- a/bin/configs/unmaintained/python-legacy.yaml
+++ b/bin/configs/unmaintained/python-legacy.yaml
@@ -1,6 +1,6 @@
generatorName: python-legacy
outputDir: samples/openapi3/client/petstore/python-legacy
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-legacy
additionalProperties:
packageName: petstore_api
diff --git a/bin/configs/unmaintained/python-prior-extensions-x-auth-id-alias.yaml b/bin/configs/unmaintained/python-prior-extensions-x-auth-id-alias.yaml
index a017b13b22a..1b2e091e9c8 100644
--- a/bin/configs/unmaintained/python-prior-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/unmaintained/python-prior-extensions-x-auth-id-alias.yaml
@@ -1,6 +1,6 @@
generatorName: python-prior
outputDir: samples/openapi3/client/extensions/x-auth-id-alias/python-prior/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/python
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python
additionalProperties:
packageName: x_auth_id_alias
diff --git a/bin/configs/unmaintained/python-prior-oas2.yaml b/bin/configs/unmaintained/python-prior-oas2.yaml
index 160afab7d94..71391209104 100644
--- a/bin/configs/unmaintained/python-prior-oas2.yaml
+++ b/bin/configs/unmaintained/python-prior-oas2.yaml
@@ -4,7 +4,7 @@
# Composed schemas are schemas that contain the allOf/oneOf/anyOf keywords. v2 specs only support the allOf keyword.
generatorName: python-prior
outputDir: samples/client/petstore/python-prior
-inputSpec: modules/openapi-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-prior
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-prior
additionalProperties:
packageName: petstore_api
diff --git a/bin/configs/unmaintained/python-prior-oas2_disallowAdditionalPropertiesIfNotPresent.yaml b/bin/configs/unmaintained/python-prior-oas2_disallowAdditionalPropertiesIfNotPresent.yaml
index e524b83b4ea..9d407f307e9 100644
--- a/bin/configs/unmaintained/python-prior-oas2_disallowAdditionalPropertiesIfNotPresent.yaml
+++ b/bin/configs/unmaintained/python-prior-oas2_disallowAdditionalPropertiesIfNotPresent.yaml
@@ -1,7 +1,7 @@
generatorName: python-prior
outputDir: samples/client/petstore/python-prior_disallowAdditionalPropertiesIfNotPresent
-inputSpec: modules/openapi-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-prior
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-prior
additionalProperties:
disallowAdditionalPropertiesIfNotPresent: "true"
packageName: petstore_api
diff --git a/bin/configs/unmaintained/python-prior.yaml b/bin/configs/unmaintained/python-prior.yaml
index 11a918d1ad1..0810dca67c5 100644
--- a/bin/configs/unmaintained/python-prior.yaml
+++ b/bin/configs/unmaintained/python-prior.yaml
@@ -1,7 +1,7 @@
generatorName: python-prior
outputDir: samples/openapi3/client/petstore/python-prior
-inputSpec: modules/openapi-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-prior
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-prior
additionalProperties:
packageName: petstore_api
recursionLimit: "1234"
diff --git a/bin/configs/unmaintained/python-tornado.yaml b/bin/configs/unmaintained/python-tornado.yaml
index e7b89865d40..beafda4e994 100644
--- a/bin/configs/unmaintained/python-tornado.yaml
+++ b/bin/configs/unmaintained/python-tornado.yaml
@@ -1,7 +1,7 @@
generatorName: python-legacy
outputDir: samples/client/petstore/python-tornado
library: tornado
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/python-legacy
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/python-legacy
additionalProperties:
packageName: petstore_api
diff --git a/bin/configs/unmaintained/r-client.yaml b/bin/configs/unmaintained/r-client.yaml
index d52db86cac8..8ab7328d0fe 100644
--- a/bin/configs/unmaintained/r-client.yaml
+++ b/bin/configs/unmaintained/r-client.yaml
@@ -1,7 +1,7 @@
generatorName: r
outputDir: samples/client/petstore/R
-inputSpec: modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/r
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/r/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/r
httpUserAgent: PetstoreAgent
additionalProperties:
packageName: petstore
diff --git a/bin/configs/unmaintained/r-httr2-client.yaml b/bin/configs/unmaintained/r-httr2-client.yaml
index 15779e26d36..3d529f8e11e 100644
--- a/bin/configs/unmaintained/r-httr2-client.yaml
+++ b/bin/configs/unmaintained/r-httr2-client.yaml
@@ -1,7 +1,7 @@
generatorName: r
outputDir: samples/client/petstore/R-httr2
-inputSpec: modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/r
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/r/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/r
httpUserAgent: PetstoreAgent
library: httr2
additionalProperties:
diff --git a/bin/configs/unmaintained/r-httr2-wrapper-client.yaml b/bin/configs/unmaintained/r-httr2-wrapper-client.yaml
index 18b3dbc4bb1..63d3ada3745 100644
--- a/bin/configs/unmaintained/r-httr2-wrapper-client.yaml
+++ b/bin/configs/unmaintained/r-httr2-wrapper-client.yaml
@@ -1,7 +1,7 @@
generatorName: r
outputDir: samples/client/petstore/R-httr2-wrapper
-inputSpec: modules/openapi-generator/src/test/resources/3_0/r/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/r
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/r/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/r
httpUserAgent: PetstoreAgent
library: httr2
additionalProperties:
diff --git a/bin/configs/unmaintained/ruby-autoload.yaml b/bin/configs/unmaintained/ruby-autoload.yaml
index ee8e82896d0..74bedd6abb8 100644
--- a/bin/configs/unmaintained/ruby-autoload.yaml
+++ b/bin/configs/unmaintained/ruby-autoload.yaml
@@ -1,8 +1,8 @@
generatorName: ruby
outputDir: samples/client/petstore/ruby-autoload
library: typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-client
additionalProperties:
gemVersion: 1.0.0
moduleName: Petstore
diff --git a/bin/configs/unmaintained/ruby-extensions-x-auth-id-alias.yaml b/bin/configs/unmaintained/ruby-extensions-x-auth-id-alias.yaml
index 7f51216567c..a6e074be84d 100644
--- a/bin/configs/unmaintained/ruby-extensions-x-auth-id-alias.yaml
+++ b/bin/configs/unmaintained/ruby-extensions-x-auth-id-alias.yaml
@@ -1,7 +1,7 @@
generatorName: ruby
outputDir: samples/openapi3/client/extensions/x-auth-id-alias/ruby-client
-inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-client
additionalProperties:
gemName: x_auth_id_alias
gemVersion: 1.0.0
diff --git a/bin/configs/unmaintained/ruby-faraday.yaml b/bin/configs/unmaintained/ruby-faraday.yaml
index b289ae977f4..0dda621aa39 100644
--- a/bin/configs/unmaintained/ruby-faraday.yaml
+++ b/bin/configs/unmaintained/ruby-faraday.yaml
@@ -1,8 +1,8 @@
generatorName: ruby
outputDir: samples/client/petstore/ruby-faraday
library: faraday
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-client
additionalProperties:
gemVersion: 1.0.0
moduleName: Petstore
diff --git a/bin/configs/unmaintained/ruby-features-dynamic-servers.yaml b/bin/configs/unmaintained/ruby-features-dynamic-servers.yaml
index 469beff7171..b9a9c938956 100644
--- a/bin/configs/unmaintained/ruby-features-dynamic-servers.yaml
+++ b/bin/configs/unmaintained/ruby-features-dynamic-servers.yaml
@@ -1,7 +1,7 @@
generatorName: ruby
outputDir: samples/openapi3/client/features/dynamic-servers/ruby/
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/dynamic-servers.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/features/dynamic-servers.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-client
additionalProperties:
gemVersion: 1.0.0
moduleName: DynamicServers
diff --git a/bin/configs/unmaintained/ruby-generate-alias-as-model.yaml b/bin/configs/unmaintained/ruby-generate-alias-as-model.yaml
index 126e1e09483..910726340db 100644
--- a/bin/configs/unmaintained/ruby-generate-alias-as-model.yaml
+++ b/bin/configs/unmaintained/ruby-generate-alias-as-model.yaml
@@ -1,8 +1,8 @@
generatorName: ruby
outputDir: samples/openapi3/client/features/generate-alias-as-model/ruby-client/
library: typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/features/generate-alias-as-model.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/features/generate-alias-as-model.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-client
additionalProperties:
gemVersion: 1.0.0
moduleName: Petstore
diff --git a/bin/configs/unmaintained/ruby-on-rails.yaml b/bin/configs/unmaintained/ruby-on-rails.yaml
index 931c44baa00..51b89440e8f 100644
--- a/bin/configs/unmaintained/ruby-on-rails.yaml
+++ b/bin/configs/unmaintained/ruby-on-rails.yaml
@@ -1,4 +1,4 @@
generatorName: ruby-on-rails
outputDir: samples/server/petstore/ruby-on-rails
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-on-rails-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-on-rails-server
diff --git a/bin/configs/unmaintained/ruby-sinatra.yaml b/bin/configs/unmaintained/ruby-sinatra.yaml
index f612a023c30..630059e2300 100644
--- a/bin/configs/unmaintained/ruby-sinatra.yaml
+++ b/bin/configs/unmaintained/ruby-sinatra.yaml
@@ -1,4 +1,4 @@
generatorName: ruby-sinatra
outputDir: samples/server/petstore/ruby-sinatra
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-sinatra-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-sinatra-server
diff --git a/bin/configs/unmaintained/ruby.yaml b/bin/configs/unmaintained/ruby.yaml
index 1a7e2c24363..24bf1881eff 100644
--- a/bin/configs/unmaintained/ruby.yaml
+++ b/bin/configs/unmaintained/ruby.yaml
@@ -1,8 +1,8 @@
generatorName: ruby
outputDir: samples/client/petstore/ruby
library: typhoeus
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/ruby-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/ruby-client
additionalProperties:
gemVersion: 1.0.0
moduleName: Petstore
diff --git a/bin/configs/unmaintained/rust-hyper-petstore.yaml b/bin/configs/unmaintained/rust-hyper-petstore.yaml
index 0d8ab210f77..725e7a30e02 100644
--- a/bin/configs/unmaintained/rust-hyper-petstore.yaml
+++ b/bin/configs/unmaintained/rust-hyper-petstore.yaml
@@ -1,8 +1,8 @@
generatorName: rust
outputDir: samples/client/petstore/rust/hyper/petstore
library: hyper
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust
additionalProperties:
supportAsync: "false"
packageName: petstore-hyper
diff --git a/bin/configs/unmaintained/rust-reqwest-petstore-async.yaml b/bin/configs/unmaintained/rust-reqwest-petstore-async.yaml
index ed156ec550e..95d35173ec5 100644
--- a/bin/configs/unmaintained/rust-reqwest-petstore-async.yaml
+++ b/bin/configs/unmaintained/rust-reqwest-petstore-async.yaml
@@ -1,8 +1,8 @@
generatorName: rust
outputDir: samples/client/petstore/rust/reqwest/petstore-async
library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust
additionalProperties:
supportAsync: true
supportMultipleResponses: true
diff --git a/bin/configs/unmaintained/rust-reqwest-petstore-awsv4signature.yaml b/bin/configs/unmaintained/rust-reqwest-petstore-awsv4signature.yaml
index 3ffd335719a..9bcaea6ecac 100644
--- a/bin/configs/unmaintained/rust-reqwest-petstore-awsv4signature.yaml
+++ b/bin/configs/unmaintained/rust-reqwest-petstore-awsv4signature.yaml
@@ -1,8 +1,8 @@
generatorName: rust
outputDir: samples/client/petstore/rust/reqwest/petstore-awsv4signature
library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust
additionalProperties:
supportAsync: false
packageName: petstore-reqwest-awsv4signature
diff --git a/bin/configs/unmaintained/rust-reqwest-petstore.yaml b/bin/configs/unmaintained/rust-reqwest-petstore.yaml
index e107582b217..a892310aa34 100644
--- a/bin/configs/unmaintained/rust-reqwest-petstore.yaml
+++ b/bin/configs/unmaintained/rust-reqwest-petstore.yaml
@@ -1,8 +1,8 @@
generatorName: rust
outputDir: samples/client/petstore/rust/reqwest/petstore
library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust
additionalProperties:
supportAsync: false
packageName: petstore-reqwest
diff --git a/bin/configs/unmaintained/rust-server-multipart-v3.yaml b/bin/configs/unmaintained/rust-server-multipart-v3.yaml
index ca84dfb04e6..e5996c4ddfb 100644
--- a/bin/configs/unmaintained/rust-server-multipart-v3.yaml
+++ b/bin/configs/unmaintained/rust-server-multipart-v3.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/multipart-v3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/multipart-v3.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/multipart-v3.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/rust-server-no-example-v3.yaml b/bin/configs/unmaintained/rust-server-no-example-v3.yaml
index 5694c8373e5..0e2d29e4cb1 100644
--- a/bin/configs/unmaintained/rust-server-no-example-v3.yaml
+++ b/bin/configs/unmaintained/rust-server-no-example-v3.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/no-example-v3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/rust-server-openapi-v3.yaml b/bin/configs/unmaintained/rust-server-openapi-v3.yaml
index 6ed1c294662..db370bfd923 100644
--- a/bin/configs/unmaintained/rust-server-openapi-v3.yaml
+++ b/bin/configs/unmaintained/rust-server-openapi-v3.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/openapi-v3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/rust-server-ops-v3.yaml b/bin/configs/unmaintained/rust-server-ops-v3.yaml
index 5d8f47cea46..f956a7d5813 100644
--- a/bin/configs/unmaintained/rust-server-ops-v3.yaml
+++ b/bin/configs/unmaintained/rust-server-ops-v3.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/ops-v3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/ops-v3.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/ops-v3.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/rust-server-petstore-with-fake-endpoints-models-for-testing.yaml b/bin/configs/unmaintained/rust-server-petstore-with-fake-endpoints-models-for-testing.yaml
index 7e009c7d952..c9d9c5b61a5 100644
--- a/bin/configs/unmaintained/rust-server-petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/bin/configs/unmaintained/rust-server-petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing
-inputSpec: modules/openapi-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/rust-server-ping-bearer-auth-v3.yaml b/bin/configs/unmaintained/rust-server-ping-bearer-auth-v3.yaml
index 5f02e791e1a..c19b72b5e81 100644
--- a/bin/configs/unmaintained/rust-server-ping-bearer-auth-v3.yaml
+++ b/bin/configs/unmaintained/rust-server-ping-bearer-auth-v3.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/ping-bearer-auth
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/rust-server-test.yaml b/bin/configs/unmaintained/rust-server-test.yaml
index 522a66ad227..4e8bd25ad1c 100644
--- a/bin/configs/unmaintained/rust-server-test.yaml
+++ b/bin/configs/unmaintained/rust-server-test.yaml
@@ -1,7 +1,7 @@
generatorName: rust-server
outputDir: samples/server/petstore/rust-server/output/rust-server-test
-inputSpec: modules/openapi-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/rust-server
generateAliasAsModel: true
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/scala-akka-http-server.yaml b/bin/configs/unmaintained/scala-akka-http-server.yaml
index 9c939d81af0..560d155fbc2 100644
--- a/bin/configs/unmaintained/scala-akka-http-server.yaml
+++ b/bin/configs/unmaintained/scala-akka-http-server.yaml
@@ -1,6 +1,6 @@
generatorName: scala-akka-http-server
outputDir: samples/server/petstore/scala-akka-http-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-akka-http-server
additionalProperties:
artifactId: openapi-scala-akka-http-server
diff --git a/bin/configs/unmaintained/scala-akka.yaml b/bin/configs/unmaintained/scala-akka.yaml
index 0a22803ca9e..c6a7cde91a9 100644
--- a/bin/configs/unmaintained/scala-akka.yaml
+++ b/bin/configs/unmaintained/scala-akka.yaml
@@ -1,6 +1,6 @@
generatorName: scala-akka
outputDir: samples/client/petstore/scala-akka
-inputSpec: modules/openapi-generator/src/test/resources/3_0/scala-akka/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-akka-client
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/scala-akka/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-akka-client
additionalProperties:
artifactId: scala-akka-petstore-client
diff --git a/bin/configs/unmaintained/scala-finch.yaml b/bin/configs/unmaintained/scala-finch.yaml
index 4ec9a16b9f5..290b0de3dec 100644
--- a/bin/configs/unmaintained/scala-finch.yaml
+++ b/bin/configs/unmaintained/scala-finch.yaml
@@ -2,5 +2,5 @@ systemProperties:
skipFormModel: "true"
generatorName: scala-finch
outputDir: samples/server/petstore/scala-finch
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-finch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-finch
diff --git a/bin/configs/unmaintained/scala-gatling.yaml b/bin/configs/unmaintained/scala-gatling.yaml
index 19858a71e1c..cf016186222 100644
--- a/bin/configs/unmaintained/scala-gatling.yaml
+++ b/bin/configs/unmaintained/scala-gatling.yaml
@@ -1,4 +1,4 @@
generatorName: scala-gatling
outputDir: samples/client/petstore/scala-gatling
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-gatling
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-gatling
diff --git a/bin/configs/unmaintained/scala-httpclient-deprecated-scala-httpclient.yaml b/bin/configs/unmaintained/scala-httpclient-deprecated-scala-httpclient.yaml
index 45bfe59e5e1..09bd521757a 100644
--- a/bin/configs/unmaintained/scala-httpclient-deprecated-scala-httpclient.yaml
+++ b/bin/configs/unmaintained/scala-httpclient-deprecated-scala-httpclient.yaml
@@ -1,4 +1,4 @@
generatorName: scala-httpclient-deprecated
outputDir: samples/client/petstore/scala-httpclient
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-httpclient
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-httpclient
diff --git a/bin/configs/unmaintained/scala-lagom-server.yaml b/bin/configs/unmaintained/scala-lagom-server.yaml
index 8aabf4b0fd0..b975aa55352 100644
--- a/bin/configs/unmaintained/scala-lagom-server.yaml
+++ b/bin/configs/unmaintained/scala-lagom-server.yaml
@@ -2,5 +2,5 @@ systemProperties:
skipFormModel: "true"
generatorName: scala-lagom-server
outputDir: samples/server/petstore/scala-lagom-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-lagom-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-lagom-server
diff --git a/bin/configs/unmaintained/scala-legacy.yaml b/bin/configs/unmaintained/scala-legacy.yaml
index 7c9c1865bc0..b65cc32fb50 100644
--- a/bin/configs/unmaintained/scala-legacy.yaml
+++ b/bin/configs/unmaintained/scala-legacy.yaml
@@ -1,9 +1,9 @@
# This is for generating scala legacy client
generatorName: scala-httpclient-deprecated
outputDir: samples/client/petstore/scala-httpclient-deprecated
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-httpclient
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-httpclient
additionalProperties:
- apiPackage: org.openapitools.example.api
- invokerPackage: org.openapitools.example.invoker
+ apiPackage: org.openapijsonschematools.example.api
+ invokerPackage: org.openapijsonschematools.example.invoker
artifactId: scala-legacy-petstore
\ No newline at end of file
diff --git a/bin/configs/unmaintained/scala-play-server.yaml b/bin/configs/unmaintained/scala-play-server.yaml
index 8d8d7ba70f6..07b3b62ec99 100644
--- a/bin/configs/unmaintained/scala-play-server.yaml
+++ b/bin/configs/unmaintained/scala-play-server.yaml
@@ -1,6 +1,6 @@
generatorName: scala-play-server
outputDir: samples/server/petstore/scala-play-server
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-play-server
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-play-server
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/scala-sttp.yaml b/bin/configs/unmaintained/scala-sttp.yaml
index abcd83a23b1..7dd30bdf22d 100644
--- a/bin/configs/unmaintained/scala-sttp.yaml
+++ b/bin/configs/unmaintained/scala-sttp.yaml
@@ -1,6 +1,6 @@
generatorName: scala-sttp
outputDir: samples/client/petstore/scala-sttp
-inputSpec: modules/openapi-generator/src/test/resources/3_0/scala/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-sttp
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/scala/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scala-sttp
additionalProperties:
artifactId: scala-sttp-petstore
diff --git a/bin/configs/unmaintained/scalatra.yaml b/bin/configs/unmaintained/scalatra.yaml
index 6445e10cd84..284adcbdc7e 100644
--- a/bin/configs/unmaintained/scalatra.yaml
+++ b/bin/configs/unmaintained/scalatra.yaml
@@ -1,4 +1,4 @@
generatorName: scalatra
outputDir: samples/server/petstore/scalatra
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scalatra
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scalatra
diff --git a/bin/configs/unmaintained/scalaz.yaml b/bin/configs/unmaintained/scalaz.yaml
index 3cb4834d03b..f07f72d8d5e 100644
--- a/bin/configs/unmaintained/scalaz.yaml
+++ b/bin/configs/unmaintained/scalaz.yaml
@@ -2,5 +2,5 @@ systemProperties:
skipFormModel: "true"
generatorName: scalaz
outputDir: samples/client/petstore/scalaz
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scalaz
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/scalaz
diff --git a/bin/configs/unmaintained/spring-boot-3.yaml b/bin/configs/unmaintained/spring-boot-3.yaml
index 5c8b97cdad1..2005e0685c3 100644
--- a/bin/configs/unmaintained/spring-boot-3.yaml
+++ b/bin/configs/unmaintained/spring-boot-3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: springboot
snapshotVersion: "true"
diff --git a/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable-oas3.yaml b/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable-oas3.yaml
index b1e5245ae85..b4a239539d8 100644
--- a/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable-oas3.yaml
+++ b/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable-oas3.yaml
@@ -1,10 +1,10 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
java8: "false"
useBeanValidation: true
diff --git a/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable.yaml b/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable.yaml
index 1457469bc72..24ad4571fd7 100644
--- a/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable.yaml
+++ b/bin/configs/unmaintained/spring-boot-beanvalidation-no-nullable.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-beanvalidation-no-nullable
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
java8: "false"
diff --git a/bin/configs/unmaintained/spring-boot-beanvalidation.yaml b/bin/configs/unmaintained/spring-boot-beanvalidation.yaml
index 4a5daef5845..5d8e166a7d3 100644
--- a/bin/configs/unmaintained/spring-boot-beanvalidation.yaml
+++ b/bin/configs/unmaintained/spring-boot-beanvalidation.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-beanvalidation
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
useSwaggerUI: false
diff --git a/bin/configs/unmaintained/spring-boot-defaultInterface-unhandledException.yaml b/bin/configs/unmaintained/spring-boot-defaultInterface-unhandledException.yaml
index 3d492c12f76..970936cb13f 100644
--- a/bin/configs/unmaintained/spring-boot-defaultInterface-unhandledException.yaml
+++ b/bin/configs/unmaintained/spring-boot-defaultInterface-unhandledException.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/spring-boot-defaultInterface-unhandledException
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
artifactId: spring-boot-defaultInterface-unhandledException
hideGenerationTimestamp: true
diff --git a/bin/configs/unmaintained/spring-boot-delegate-j8.yaml b/bin/configs/unmaintained/spring-boot-delegate-j8.yaml
index e1fae5805cd..77e7b200b6a 100644
--- a/bin/configs/unmaintained/spring-boot-delegate-j8.yaml
+++ b/bin/configs/unmaintained/spring-boot-delegate-j8.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-delegate-j8
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: springboot-delegate-j8
diff --git a/bin/configs/unmaintained/spring-boot-delegate-oas3.yaml b/bin/configs/unmaintained/spring-boot-delegate-oas3.yaml
index 8b604d558a9..711240b8e15 100644
--- a/bin/configs/unmaintained/spring-boot-delegate-oas3.yaml
+++ b/bin/configs/unmaintained/spring-boot-delegate-oas3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-delegate
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: springboot-delegate
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/spring-boot-delegate.yaml b/bin/configs/unmaintained/spring-boot-delegate.yaml
index 228b14d823e..2b4eab3b0b6 100644
--- a/bin/configs/unmaintained/spring-boot-delegate.yaml
+++ b/bin/configs/unmaintained/spring-boot-delegate.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-delegate
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: springboot-delegate
diff --git a/bin/configs/unmaintained/spring-boot-implicitHeaders-annotationLibrary.yaml b/bin/configs/unmaintained/spring-boot-implicitHeaders-annotationLibrary.yaml
index 7e9fb4758ce..79933b8a234 100644
--- a/bin/configs/unmaintained/spring-boot-implicitHeaders-annotationLibrary.yaml
+++ b/bin/configs/unmaintained/spring-boot-implicitHeaders-annotationLibrary.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-implicitHeaders-annotationLibrary
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
artifactId: springboot-implicitHeaders-annotationLibrary
documentationProvider: none
diff --git a/bin/configs/unmaintained/spring-boot-implicitHeaders-oas3.yaml b/bin/configs/unmaintained/spring-boot-implicitHeaders-oas3.yaml
index 3d9423cd326..0138a39e95f 100644
--- a/bin/configs/unmaintained/spring-boot-implicitHeaders-oas3.yaml
+++ b/bin/configs/unmaintained/spring-boot-implicitHeaders-oas3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-implicitHeaders
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
oas3: "true"
artifactId: springboot-implicitHeaders
diff --git a/bin/configs/unmaintained/spring-boot-implicitHeaders.yaml b/bin/configs/unmaintained/spring-boot-implicitHeaders.yaml
index d870353a0ff..e130b4db45c 100644
--- a/bin/configs/unmaintained/spring-boot-implicitHeaders.yaml
+++ b/bin/configs/unmaintained/spring-boot-implicitHeaders.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-implicitHeaders
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
artifactId: springboot-implicitHeaders
documentationProvider: springfox
diff --git a/bin/configs/unmaintained/spring-boot-oas3.yaml b/bin/configs/unmaintained/spring-boot-oas3.yaml
index 21994a14ad4..3fa5c6d530c 100644
--- a/bin/configs/unmaintained/spring-boot-oas3.yaml
+++ b/bin/configs/unmaintained/spring-boot-oas3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: springboot
snapshotVersion: "true"
diff --git a/bin/configs/unmaintained/spring-boot-oneof.yaml b/bin/configs/unmaintained/spring-boot-oneof.yaml
index a986fc8fabe..13432931153 100644
--- a/bin/configs/unmaintained/spring-boot-oneof.yaml
+++ b/bin/configs/unmaintained/spring-boot-oneof.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/spring-boot-oneof
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: springboot-oneof
snapshotVersion: "true"
diff --git a/bin/configs/unmaintained/spring-boot-reactive-oas3.yaml b/bin/configs/unmaintained/spring-boot-reactive-oas3.yaml
index 3e3fb91657b..d7af4ceddef 100644
--- a/bin/configs/unmaintained/spring-boot-reactive-oas3.yaml
+++ b/bin/configs/unmaintained/spring-boot-reactive-oas3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-reactive
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: springboot-reactive
reactive: "true"
diff --git a/bin/configs/unmaintained/spring-boot-reactive.yaml b/bin/configs/unmaintained/spring-boot-reactive.yaml
index b3edff7de11..fc57289a59f 100644
--- a/bin/configs/unmaintained/spring-boot-reactive.yaml
+++ b/bin/configs/unmaintained/spring-boot-reactive.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-reactive
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
artifactId: springboot-reactive
documentationProvider: springfox
diff --git a/bin/configs/unmaintained/spring-boot-source.yaml b/bin/configs/unmaintained/spring-boot-source.yaml
index a1572c0e19c..9237927bf13 100644
--- a/bin/configs/unmaintained/spring-boot-source.yaml
+++ b/bin/configs/unmaintained/spring-boot-source.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-source
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: source
artifactId: springboot
snapshotVersion: "true"
diff --git a/bin/configs/unmaintained/spring-boot-springdoc.yaml b/bin/configs/unmaintained/spring-boot-springdoc.yaml
index fe479cd21e7..1150ec15d16 100644
--- a/bin/configs/unmaintained/spring-boot-springdoc.yaml
+++ b/bin/configs/unmaintained/spring-boot-springdoc.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/spring-boot-springdoc
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
useSwaggerUI: false
artifactId: spring-boot-springdoc
diff --git a/bin/configs/unmaintained/spring-boot-useoptional-oas3.yaml b/bin/configs/unmaintained/spring-boot-useoptional-oas3.yaml
index ac66d1df148..1b6955a074e 100644
--- a/bin/configs/unmaintained/spring-boot-useoptional-oas3.yaml
+++ b/bin/configs/unmaintained/spring-boot-useoptional-oas3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/server/petstore/springboot-useoptional
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
useOptional: true
artifactId: spring-boot-useoptional
diff --git a/bin/configs/unmaintained/spring-boot-useoptional.yaml b/bin/configs/unmaintained/spring-boot-useoptional.yaml
index 1e028977898..f6345e79fa6 100644
--- a/bin/configs/unmaintained/spring-boot-useoptional.yaml
+++ b/bin/configs/unmaintained/spring-boot-useoptional.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-useoptional
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
useOptional: true
diff --git a/bin/configs/unmaintained/spring-boot-virtualan.yaml b/bin/configs/unmaintained/spring-boot-virtualan.yaml
index f1ae90fa859..2beddfeb651 100644
--- a/bin/configs/unmaintained/spring-boot-virtualan.yaml
+++ b/bin/configs/unmaintained/spring-boot-virtualan.yaml
@@ -1,12 +1,12 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-virtualan
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springdoc
- apiPackage: org.openapitools.virtualan.api
- modelPackage: org.openapitools.virtualan.model
+ apiPackage: org.openapijsonschematools.virtualan.api
+ modelPackage: org.openapijsonschematools.virtualan.model
virtualService: true
artifactId: springboot-virtualan
hideGenerationTimestamp: "true"
diff --git a/bin/configs/unmaintained/spring-boot.yaml b/bin/configs/unmaintained/spring-boot.yaml
index fe2345e7126..2656269e47d 100644
--- a/bin/configs/unmaintained/spring-boot.yaml
+++ b/bin/configs/unmaintained/spring-boot.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/springboot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: springboot
diff --git a/bin/configs/unmaintained/spring-cloud-3.yaml b/bin/configs/unmaintained/spring-cloud-3.yaml
index 392f4389537..e9483a14ce6 100644
--- a/bin/configs/unmaintained/spring-cloud-3.yaml
+++ b/bin/configs/unmaintained/spring-cloud-3.yaml
@@ -1,10 +1,10 @@
generatorName: spring
library: spring-cloud
outputDir: samples/openapi3/client/petstore/spring-cloud-3
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-cloud-oas3
useSpringBoot3: "true"
diff --git a/bin/configs/unmaintained/spring-cloud-async-oas3.yaml b/bin/configs/unmaintained/spring-cloud-async-oas3.yaml
index 59c9d22e695..a03cb304ae8 100644
--- a/bin/configs/unmaintained/spring-cloud-async-oas3.yaml
+++ b/bin/configs/unmaintained/spring-cloud-async-oas3.yaml
@@ -1,10 +1,10 @@
generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-cloud-async
library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
async: "true"
java8: "true"
diff --git a/bin/configs/unmaintained/spring-cloud-async.yaml b/bin/configs/unmaintained/spring-cloud-async.yaml
index b14f654366f..c1705f2d467 100644
--- a/bin/configs/unmaintained/spring-cloud-async.yaml
+++ b/bin/configs/unmaintained/spring-cloud-async.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/client/petstore/spring-cloud-async
library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
async: "true"
diff --git a/bin/configs/unmaintained/spring-cloud-date-time-oas3.yaml b/bin/configs/unmaintained/spring-cloud-date-time-oas3.yaml
index 9e5724d2ac9..b418a8326ae 100644
--- a/bin/configs/unmaintained/spring-cloud-date-time-oas3.yaml
+++ b/bin/configs/unmaintained/spring-cloud-date-time-oas3.yaml
@@ -1,10 +1,10 @@
generatorName: spring
library: spring-cloud
outputDir: samples/openapi3/client/petstore/spring-cloud-date-time
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-cloud-date-time-oas3
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/spring-cloud-date-time.yaml b/bin/configs/unmaintained/spring-cloud-date-time.yaml
index ff06030aab3..7b7c5f06660 100644
--- a/bin/configs/unmaintained/spring-cloud-date-time.yaml
+++ b/bin/configs/unmaintained/spring-cloud-date-time.yaml
@@ -1,8 +1,8 @@
generatorName: spring
library: spring-cloud
outputDir: samples/client/petstore/spring-cloud-date-time
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: spring-cloud-date-time
diff --git a/bin/configs/unmaintained/spring-cloud-oas3-fakeapi.yaml b/bin/configs/unmaintained/spring-cloud-oas3-fakeapi.yaml
index 3f4e3c8ba3a..89f3175c5a2 100644
--- a/bin/configs/unmaintained/spring-cloud-oas3-fakeapi.yaml
+++ b/bin/configs/unmaintained/spring-cloud-oas3-fakeapi.yaml
@@ -1,10 +1,10 @@
generatorName: spring
library: spring-cloud
outputDir: samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-cloud-oas3
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/spring-cloud-oas3.yaml b/bin/configs/unmaintained/spring-cloud-oas3.yaml
index c43b53303af..7512f937037 100644
--- a/bin/configs/unmaintained/spring-cloud-oas3.yaml
+++ b/bin/configs/unmaintained/spring-cloud-oas3.yaml
@@ -1,10 +1,10 @@
generatorName: spring
library: spring-cloud
outputDir: samples/openapi3/client/petstore/spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-cloud-oas3
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable-oas3.yaml b/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
index 02c96627b64..65a6d15cce4 100644
--- a/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
+++ b/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
@@ -1,10 +1,10 @@
generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-cloud-spring-pageable
library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-cloud-spring-pageable
hideGenerationTimestamp: 'true'
diff --git a/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable.yaml b/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable.yaml
index 506a1c53be6..4205ad47dfb 100644
--- a/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable.yaml
+++ b/bin/configs/unmaintained/spring-cloud-petstore-feign-spring-pageable.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/client/petstore/spring-cloud-spring-pageable
library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: spring-cloud-spring-pageable
diff --git a/bin/configs/unmaintained/spring-cloud-petstore-feign-without-url-param.yaml b/bin/configs/unmaintained/spring-cloud-petstore-feign-without-url-param.yaml
index 9b86ed155ed..205b92bc184 100644
--- a/bin/configs/unmaintained/spring-cloud-petstore-feign-without-url-param.yaml
+++ b/bin/configs/unmaintained/spring-cloud-petstore-feign-without-url-param.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/client/petstore/spring-cloud-feign-without-url
library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: petstore-spring-cloud
diff --git a/bin/configs/unmaintained/spring-cloud.yaml b/bin/configs/unmaintained/spring-cloud.yaml
index cd207cd64cd..5ef4970272e 100644
--- a/bin/configs/unmaintained/spring-cloud.yaml
+++ b/bin/configs/unmaintained/spring-cloud.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/client/petstore/spring-cloud
library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: petstore-spring-cloud
diff --git a/bin/configs/unmaintained/spring-nullable-set.yaml b/bin/configs/unmaintained/spring-nullable-set.yaml
index 64122c7cf3c..d695c4d6d7d 100644
--- a/bin/configs/unmaintained/spring-nullable-set.yaml
+++ b/bin/configs/unmaintained/spring-nullable-set.yaml
@@ -1,8 +1,8 @@
generatorName: spring
library: spring-boot
outputDir: samples/server/petstore/spring-boot-nullable-set
-inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/10167-nullable-set.yml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/spring/10167-nullable-set.yml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
artifactId: spring-boot-nullable-set
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/spring-stubs-oas3.yaml b/bin/configs/unmaintained/spring-stubs-oas3.yaml
index d5149f28adc..9c46d9985e8 100644
--- a/bin/configs/unmaintained/spring-stubs-oas3.yaml
+++ b/bin/configs/unmaintained/spring-stubs-oas3.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-stubs
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-stubs
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/spring-stubs-skip-default-interface.yaml b/bin/configs/unmaintained/spring-stubs-skip-default-interface.yaml
index bb107e0bd2a..4e2be190dbd 100644
--- a/bin/configs/unmaintained/spring-stubs-skip-default-interface.yaml
+++ b/bin/configs/unmaintained/spring-stubs-skip-default-interface.yaml
@@ -1,9 +1,9 @@
generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-stubs-skip-default-interface
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
- groupId: org.openapitools.openapi3
+ groupId: org.openapijsonschematools.openapi3
documentationProvider: springdoc
artifactId: spring-stubs
interfaceOnly: "true"
diff --git a/bin/configs/unmaintained/spring-stubs.yaml b/bin/configs/unmaintained/spring-stubs.yaml
index 349c5e229c7..3fb8f650aae 100644
--- a/bin/configs/unmaintained/spring-stubs.yaml
+++ b/bin/configs/unmaintained/spring-stubs.yaml
@@ -1,7 +1,7 @@
generatorName: spring
outputDir: samples/server/petstore/spring-stubs
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: spring-stubs
diff --git a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
index 7d16b4a1e76..72c85acae0c 100644
--- a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
+++ b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
delegatePattern: true
java8: false
additionalProperties:
diff --git a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern.yaml b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern.yaml
index c4d1eb5b687..a32b6fc4930 100644
--- a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern.yaml
+++ b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-delegatePattern.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
delegatePattern: true
additionalProperties:
documentationProvider: springfox
diff --git a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-without-j8.yaml b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-without-j8.yaml
index 87c63968490..56f56d6d55d 100644
--- a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-without-j8.yaml
+++ b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable-without-j8.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable-without-j8
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
java8: false
additionalProperties:
documentationProvider: springfox
diff --git a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable.yaml b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable.yaml
index db518c22604..8ec43c40222 100644
--- a/bin/configs/unmaintained/springboot-petstore-server-spring-pageable.yaml
+++ b/bin/configs/unmaintained/springboot-petstore-server-spring-pageable.yaml
@@ -1,8 +1,8 @@
generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable
library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: springboot-spring-pageable
diff --git a/bin/configs/unmaintained/swift5-alamofireLibrary.yaml b/bin/configs/unmaintained/swift5-alamofireLibrary.yaml
index 4c248326d53..3fdb3adbd1a 100644
--- a/bin/configs/unmaintained/swift5-alamofireLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-alamofireLibrary.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/alamofireLibrary
library: alamofire
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-asyncAwaitLibrary.yaml b/bin/configs/unmaintained/swift5-asyncAwaitLibrary.yaml
index fed714a2d68..ce39b971df0 100644
--- a/bin/configs/unmaintained/swift5-asyncAwaitLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-asyncAwaitLibrary.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/asyncAwaitLibrary
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
responseAs: AsyncAwait
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-combineLibrary.yaml b/bin/configs/unmaintained/swift5-combineLibrary.yaml
index 9456638acf9..0bad19615f3 100644
--- a/bin/configs/unmaintained/swift5-combineLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-combineLibrary.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/combineLibrary
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
responseAs: Combine
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-default.yaml b/bin/configs/unmaintained/swift5-default.yaml
index fffd318be1a..0475ee2d102 100644
--- a/bin/configs/unmaintained/swift5-default.yaml
+++ b/bin/configs/unmaintained/swift5-default.yaml
@@ -1,10 +1,10 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-deprecated.yaml b/bin/configs/unmaintained/swift5-deprecated.yaml
index 0b020673134..8223592cb48 100644
--- a/bin/configs/unmaintained/swift5-deprecated.yaml
+++ b/bin/configs/unmaintained/swift5-deprecated.yaml
@@ -1,10 +1,10 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/deprecated
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-frozenEnums.yaml b/bin/configs/unmaintained/swift5-frozenEnums.yaml
index 38ca413f350..cec59ef4552 100644
--- a/bin/configs/unmaintained/swift5-frozenEnums.yaml
+++ b/bin/configs/unmaintained/swift5-frozenEnums.yaml
@@ -1,7 +1,7 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/frozenEnums
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
@@ -9,4 +9,4 @@ additionalProperties:
sortParamsByRequiredFlag: false
enumUnknownDefaultCase: true
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-nonPublicApi.yaml b/bin/configs/unmaintained/swift5-nonPublicApi.yaml
index 1aec2c3bb16..12089d0d2f8 100644
--- a/bin/configs/unmaintained/swift5-nonPublicApi.yaml
+++ b/bin/configs/unmaintained/swift5-nonPublicApi.yaml
@@ -1,7 +1,7 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/nonPublicApi
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
@@ -9,4 +9,4 @@ additionalProperties:
sortParamsByRequiredFlag: false
nonPublicApi: true
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-objcCompatible.yaml b/bin/configs/unmaintained/swift5-objcCompatible.yaml
index deb33907cc4..6246e7409ec 100644
--- a/bin/configs/unmaintained/swift5-objcCompatible.yaml
+++ b/bin/configs/unmaintained/swift5-objcCompatible.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/objcCompatible
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
objcCompatible: true
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-oneOf.yaml b/bin/configs/unmaintained/swift5-oneOf.yaml
index 975892b340c..01975eb8fd6 100644
--- a/bin/configs/unmaintained/swift5-oneOf.yaml
+++ b/bin/configs/unmaintained/swift5-oneOf.yaml
@@ -1,10 +1,10 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/oneOf
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-promisekitLibrary.yaml b/bin/configs/unmaintained/swift5-promisekitLibrary.yaml
index 5cdeb02ad29..5e5a06d2650 100644
--- a/bin/configs/unmaintained/swift5-promisekitLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-promisekitLibrary.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/promisekitLibrary
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
responseAs: PromiseKit
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-readonlyProperties.yaml b/bin/configs/unmaintained/swift5-readonlyProperties.yaml
index 0bb8b9d6f57..057e34de947 100644
--- a/bin/configs/unmaintained/swift5-readonlyProperties.yaml
+++ b/bin/configs/unmaintained/swift5-readonlyProperties.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/readonlyProperties
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
readonlyProperties: true
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/bin/configs/unmaintained/swift5-resultLibrary.yaml b/bin/configs/unmaintained/swift5-resultLibrary.yaml
index 01de8b1d98e..00f8e14580f 100644
--- a/bin/configs/unmaintained/swift5-resultLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-resultLibrary.yaml
@@ -1,12 +1,12 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/resultLibrary
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
responseAs: Result
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
removeMigrationProjectNameClass: true
diff --git a/bin/configs/unmaintained/swift5-rxswiftLibrary.yaml b/bin/configs/unmaintained/swift5-rxswiftLibrary.yaml
index 8751d347912..7e19284f064 100644
--- a/bin/configs/unmaintained/swift5-rxswiftLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-rxswiftLibrary.yaml
@@ -1,13 +1,13 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/rxswiftLibrary
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
responseAs: RxSwift
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
useBacktickEscapes: true
generateModelAdditionalProperties: false
diff --git a/bin/configs/unmaintained/swift5-urlsessionLibrary.yaml b/bin/configs/unmaintained/swift5-urlsessionLibrary.yaml
index 1520a7c1ea9..1ec29023d1c 100644
--- a/bin/configs/unmaintained/swift5-urlsessionLibrary.yaml
+++ b/bin/configs/unmaintained/swift5-urlsessionLibrary.yaml
@@ -1,14 +1,14 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/urlsessionLibrary
library: urlsession
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
useSPMFileStructure: true
useClasses: true
swiftUseApiNamespace: true
diff --git a/bin/configs/unmaintained/swift5-vapor.yaml b/bin/configs/unmaintained/swift5-vapor.yaml
index 5f1d2067969..a9cae263d6e 100644
--- a/bin/configs/unmaintained/swift5-vapor.yaml
+++ b/bin/configs/unmaintained/swift5-vapor.yaml
@@ -1,8 +1,8 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/vaporLibrary
library: vapor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
projectName: PetstoreClient
diff --git a/bin/configs/unmaintained/swift5-x-swift-hashable.yaml b/bin/configs/unmaintained/swift5-x-swift-hashable.yaml
index c07937d5336..021eba5b37f 100644
--- a/bin/configs/unmaintained/swift5-x-swift-hashable.yaml
+++ b/bin/configs/unmaintained/swift5-x-swift-hashable.yaml
@@ -1,11 +1,11 @@
generatorName: swift5
outputDir: samples/client/petstore/swift5/x-swift-hashable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/swift5
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/swift5
generateAliasAsModel: true
additionalProperties:
podAuthors: ""
podSummary: PetstoreClient
projectName: PetstoreClient
- podHomepage: https://github.com/openapitools/openapi-generator
+ podHomepage: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
hashableModels: false
diff --git a/bin/configs/unmaintained/typescript-angular-v12-oneOf.yaml b/bin/configs/unmaintained/typescript-angular-v12-oneOf.yaml
index 7d355b753cb..f9705177a2b 100644
--- a/bin/configs/unmaintained/typescript-angular-v12-oneOf.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v12-oneOf.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v12-oneOf/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 12.2.0
diff --git a/bin/configs/unmaintained/typescript-angular-v12-provided-in-any.yaml b/bin/configs/unmaintained/typescript-angular-v12-provided-in-any.yaml
index 3cc0d756b33..817fceb168d 100644
--- a/bin/configs/unmaintained/typescript-angular-v12-provided-in-any.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v12-provided-in-any.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v12-provided-in-any/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 12.2.0
providedIn: any
diff --git a/bin/configs/unmaintained/typescript-angular-v12-provided-in-root-with-npm.yaml b/bin/configs/unmaintained/typescript-angular-v12-provided-in-root-with-npm.yaml
index 35ae77b6f82..2faf5f83d23 100644
--- a/bin/configs/unmaintained/typescript-angular-v12-provided-in-root-with-npm.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v12-provided-in-root-with-npm.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 12.2.0
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-angular-petstore'
+ npmName: '@openapijsonschematools/typescript-angular-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-angular-v12-provided-in-root.yaml b/bin/configs/unmaintained/typescript-angular-v12-provided-in-root.yaml
index 746de9795ec..9e0571e9eeb 100644
--- a/bin/configs/unmaintained/typescript-angular-v12-provided-in-root.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v12-provided-in-root.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v12-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 12.2.0
diff --git a/bin/configs/unmaintained/typescript-angular-v13-oneOf.yaml b/bin/configs/unmaintained/typescript-angular-v13-oneOf.yaml
index 7bc65fcbddc..2eeb76377bb 100644
--- a/bin/configs/unmaintained/typescript-angular-v13-oneOf.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v13-oneOf.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v13-oneOf/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 13.0.1
diff --git a/bin/configs/unmaintained/typescript-angular-v13-provided-in-any.yaml b/bin/configs/unmaintained/typescript-angular-v13-provided-in-any.yaml
index 5cf16a7e0ea..ac44d7aeecc 100644
--- a/bin/configs/unmaintained/typescript-angular-v13-provided-in-any.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v13-provided-in-any.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v13-provided-in-any/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 13.0.1
providedIn: any
diff --git a/bin/configs/unmaintained/typescript-angular-v13-provided-in-root-with-npm.yaml b/bin/configs/unmaintained/typescript-angular-v13-provided-in-root-with-npm.yaml
index dcf4d96d4dd..7a3915f0a54 100644
--- a/bin/configs/unmaintained/typescript-angular-v13-provided-in-root-with-npm.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v13-provided-in-root-with-npm.yaml
@@ -1,11 +1,11 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 13.0.1
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-angular-petstore'
+ npmName: '@openapijsonschematools/typescript-angular-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
supportsES6: true
diff --git a/bin/configs/unmaintained/typescript-angular-v13-provided-in-root.yaml b/bin/configs/unmaintained/typescript-angular-v13-provided-in-root.yaml
index 564081b45e9..3c10f05f7b2 100644
--- a/bin/configs/unmaintained/typescript-angular-v13-provided-in-root.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v13-provided-in-root.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v13-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 13.0.1
supportsES6: true
diff --git a/bin/configs/unmaintained/typescript-angular-v14-provided-in-root.yaml b/bin/configs/unmaintained/typescript-angular-v14-provided-in-root.yaml
index d125554b053..380c9765261 100644
--- a/bin/configs/unmaintained/typescript-angular-v14-provided-in-root.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v14-provided-in-root.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v14-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 14.0.5
supportsES6: true
diff --git a/bin/configs/unmaintained/typescript-angular-v14-query-param-object-format.yaml b/bin/configs/unmaintained/typescript-angular-v14-query-param-object-format.yaml
index f347fe53177..c56fbb45ef5 100644
--- a/bin/configs/unmaintained/typescript-angular-v14-query-param-object-format.yaml
+++ b/bin/configs/unmaintained/typescript-angular-v14-query-param-object-format.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-angular
outputDir: samples/client/petstore/typescript-angular-v14-query-param-object-format
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-angular
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-angular
additionalProperties:
ngVersion: 14.0.5
supportsES6: true
diff --git a/bin/configs/unmaintained/typescript-aurelia-default.yaml b/bin/configs/unmaintained/typescript-aurelia-default.yaml
index 1d93065379c..78d42c8fa99 100644
--- a/bin/configs/unmaintained/typescript-aurelia-default.yaml
+++ b/bin/configs/unmaintained/typescript-aurelia-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-aurelia
outputDir: samples/client/petstore/typescript-aurelia/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-aurelia
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-aurelia
diff --git a/bin/configs/unmaintained/typescript-axios-composed-schemas.yaml b/bin/configs/unmaintained/typescript-axios-composed-schemas.yaml
index cb51a976cbf..65e7eec6282 100644
--- a/bin/configs/unmaintained/typescript-axios-composed-schemas.yaml
+++ b/bin/configs/unmaintained/typescript-axios-composed-schemas.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/composed-schemas
-inputSpec: modules/openapi-generator/src/test/resources/3_0/composed-schemas.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/composed-schemas.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
diff --git a/bin/configs/unmaintained/typescript-axios-default.yaml b/bin/configs/unmaintained/typescript-axios-default.yaml
index 8f04fba8c70..0e4791ecefe 100644
--- a/bin/configs/unmaintained/typescript-axios-default.yaml
+++ b/bin/configs/unmaintained/typescript-axios-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
diff --git a/bin/configs/unmaintained/typescript-axios-es6-target.yaml b/bin/configs/unmaintained/typescript-axios-es6-target.yaml
index 06ff80e7249..5d41c073647 100644
--- a/bin/configs/unmaintained/typescript-axios-es6-target.yaml
+++ b/bin/configs/unmaintained/typescript-axios-es6-target.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/es6-target
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
npmVersion: 1.0.0
supportsES6: true
- npmName: '@openapitools/typescript-axios-petstore'
+ npmName: '@openapijsonschematools/typescript-axios-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-axios-test-petstore.yaml b/bin/configs/unmaintained/typescript-axios-test-petstore.yaml
index 7873b2854fe..2bdf6679ce5 100644
--- a/bin/configs/unmaintained/typescript-axios-test-petstore.yaml
+++ b/bin/configs/unmaintained/typescript-axios-test-petstore.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/test-petstore
-inputSpec: modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
\ No newline at end of file
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
\ No newline at end of file
diff --git a/bin/configs/unmaintained/typescript-axios-with-complex-headers.yaml b/bin/configs/unmaintained/typescript-axios-with-complex-headers.yaml
index e4eeee792ad..8f11550f478 100644
--- a/bin/configs/unmaintained/typescript-axios-with-complex-headers.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-complex-headers.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-complex-headers
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
diff --git a/bin/configs/unmaintained/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/bin/configs/unmaintained/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 65e913fc06e..0b2be0979d7 100644
--- a/bin/configs/unmaintained/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
diff --git a/bin/configs/unmaintained/typescript-axios-with-interfaces.yaml b/bin/configs/unmaintained/typescript-axios-with-interfaces.yaml
index a1d792a5c2a..029f3cf0ec8 100644
--- a/bin/configs/unmaintained/typescript-axios-with-interfaces.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-interfaces.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-interfaces
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
withInterfaces: "true"
diff --git a/bin/configs/unmaintained/typescript-axios-with-node-imports.yaml b/bin/configs/unmaintained/typescript-axios-with-node-imports.yaml
index 1ed732421d2..d80bc7e33e3 100644
--- a/bin/configs/unmaintained/typescript-axios-with-node-imports.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-node-imports.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-node-imports
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
withNodeImports: "true"
multipartFormData: "true"
diff --git a/bin/configs/unmaintained/typescript-axios-with-npm-version-and-separate-models-and-api.yaml b/bin/configs/unmaintained/typescript-axios-with-npm-version-and-separate-models-and-api.yaml
index 5967dd11e1c..7268de95f09 100644
--- a/bin/configs/unmaintained/typescript-axios-with-npm-version-and-separate-models-and-api.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-npm-version-and-separate-models-and-api.yaml
@@ -1,12 +1,12 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
npmVersion: 1.0.0
apiPackage: api.another.level
modelPackage: model.some.levels.deep
withSeparateModelsAndApi: true
- npmName: '@openapitools/typescript-axios-petstore'
+ npmName: '@openapijsonschematools/typescript-axios-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-axios-with-npm-version.yaml b/bin/configs/unmaintained/typescript-axios-with-npm-version.yaml
index af18edee14f..57fe5cf1f05 100644
--- a/bin/configs/unmaintained/typescript-axios-with-npm-version.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-npm-version.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-npm-version
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-axios-petstore'
+ npmName: '@openapijsonschematools/typescript-axios-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-axios-with-separate-models-and-api-inheritance.yaml b/bin/configs/unmaintained/typescript-axios-with-separate-models-and-api-inheritance.yaml
index 155f7f435ff..c65f7886b4c 100644
--- a/bin/configs/unmaintained/typescript-axios-with-separate-models-and-api-inheritance.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-separate-models-and-api-inheritance.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-axios
outputDir: samples/client/others/typescript-axios/with-separate-models-and-api-inheritance
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
apiPackage: api
modelPackage: model
diff --git a/bin/configs/unmaintained/typescript-axios-with-single-request-parameters.yaml b/bin/configs/unmaintained/typescript-axios-with-single-request-parameters.yaml
index a06f70ebd6c..88b0b82897c 100644
--- a/bin/configs/unmaintained/typescript-axios-with-single-request-parameters.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-single-request-parameters.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-single-request-parameters
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
useSingleRequestParameter: "true"
diff --git a/bin/configs/unmaintained/typescript-axios-with-string-enums.yaml b/bin/configs/unmaintained/typescript-axios-with-string-enums.yaml
index 4ea5a08e30d..3f1b34438ab 100644
--- a/bin/configs/unmaintained/typescript-axios-with-string-enums.yaml
+++ b/bin/configs/unmaintained/typescript-axios-with-string-enums.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-axios
outputDir: samples/client/petstore/typescript-axios/builds/with-string-enums
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-axios
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-axios
additionalProperties:
stringEnums: true
diff --git a/bin/configs/unmaintained/typescript-consolidated-browser.yaml b/bin/configs/unmaintained/typescript-consolidated-browser.yaml
index 8ea49d065b2..17fe860212b 100644
--- a/bin/configs/unmaintained/typescript-consolidated-browser.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-browser.yaml
@@ -1,7 +1,7 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/browser
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
framework: fetch-api
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-composed-schemas.yaml b/bin/configs/unmaintained/typescript-consolidated-composed-schemas.yaml
index 0da510f5bfc..5c88fce7a7d 100644
--- a/bin/configs/unmaintained/typescript-consolidated-composed-schemas.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-composed-schemas.yaml
@@ -1,6 +1,6 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/composed-schemas
-inputSpec: modules/openapi-generator/src/test/resources/3_0/composed-schemas.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/composed-schemas.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-deno.yaml b/bin/configs/unmaintained/typescript-consolidated-deno.yaml
index b3317884609..7cceb05222d 100644
--- a/bin/configs/unmaintained/typescript-consolidated-deno.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-deno.yaml
@@ -1,7 +1,7 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/deno
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
platform: deno
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-inversify.yaml b/bin/configs/unmaintained/typescript-consolidated-inversify.yaml
index 5d230cb88ea..35052217bda 100644
--- a/bin/configs/unmaintained/typescript-consolidated-inversify.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-inversify.yaml
@@ -1,7 +1,7 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/inversify
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
platform: node
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-jquery.yaml b/bin/configs/unmaintained/typescript-consolidated-jquery.yaml
index 7e9669984c2..a2ddf236b4b 100644
--- a/bin/configs/unmaintained/typescript-consolidated-jquery.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-jquery.yaml
@@ -1,7 +1,7 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/jquery
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
framework: jquery
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-node-object-parameters.yaml b/bin/configs/unmaintained/typescript-consolidated-node-object-parameters.yaml
index 5e4e13a7ec7..378461e1bf9 100644
--- a/bin/configs/unmaintained/typescript-consolidated-node-object-parameters.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-node-object-parameters.yaml
@@ -1,7 +1,7 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/object_params
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
platform: node
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-node.yaml b/bin/configs/unmaintained/typescript-consolidated-node.yaml
index 9fb5f9a0553..ac5ad6569a4 100644
--- a/bin/configs/unmaintained/typescript-consolidated-node.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-node.yaml
@@ -1,7 +1,7 @@
generatorName: typescript
outputDir: samples/openapi3/client/petstore/typescript/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
additionalProperties:
platform: node
npmName: ts-petstore-client
diff --git a/bin/configs/unmaintained/typescript-consolidated-with-unique-items.yaml b/bin/configs/unmaintained/typescript-consolidated-with-unique-items.yaml
index ee21407df53..41413955372 100644
--- a/bin/configs/unmaintained/typescript-consolidated-with-unique-items.yaml
+++ b/bin/configs/unmaintained/typescript-consolidated-with-unique-items.yaml
@@ -1,4 +1,4 @@
generatorName: typescript
outputDir: samples/client/others/typescript/builds/with-unique-items
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript/unique_items.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/typescript/unique_items.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript
diff --git a/bin/configs/unmaintained/typescript-fetch-allOf-readonly.yaml b/bin/configs/unmaintained/typescript-fetch-allOf-readonly.yaml
index f872c77267e..b365c15ab62 100644
--- a/bin/configs/unmaintained/typescript-fetch-allOf-readonly.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-allOf-readonly.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/allOf-readonly
-inputSpec: modules/openapi-generator/src/test/resources/3_0/allOf-readonly.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-readonly.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
diff --git a/bin/configs/unmaintained/typescript-fetch-default-v3.0.yaml b/bin/configs/unmaintained/typescript-fetch-default-v3.0.yaml
index 1fbde1d4a43..7560c70d7ff 100644
--- a/bin/configs/unmaintained/typescript-fetch-default-v3.0.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-default-v3.0.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/default-v3.0
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
diff --git a/bin/configs/unmaintained/typescript-fetch-default.yaml b/bin/configs/unmaintained/typescript-fetch-default.yaml
index 1a61fc45e01..5b60ca15177 100644
--- a/bin/configs/unmaintained/typescript-fetch-default.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
diff --git a/bin/configs/unmaintained/typescript-fetch-enum.yaml b/bin/configs/unmaintained/typescript-fetch-enum.yaml
index 609b45160fa..1068b27fdab 100644
--- a/bin/configs/unmaintained/typescript-fetch-enum.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-enum.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/enum
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/enum.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-fetch/enum.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
diff --git a/bin/configs/unmaintained/typescript-fetch-es6-target.yaml b/bin/configs/unmaintained/typescript-fetch-es6-target.yaml
index 929fd29d1ce..5a47ecdc680 100644
--- a/bin/configs/unmaintained/typescript-fetch-es6-target.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-es6-target.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/es6-target
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
supportsES6: true
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-fetch-multiple-parameters.yaml b/bin/configs/unmaintained/typescript-fetch-multiple-parameters.yaml
index c0711f3baba..fd3e31f70e6 100644
--- a/bin/configs/unmaintained/typescript-fetch-multiple-parameters.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-multiple-parameters.yaml
@@ -1,7 +1,7 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/multiple-parameters
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
useSingleRequestParameter: false
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-fetch-prefix-parameter-interfaces.yaml b/bin/configs/unmaintained/typescript-fetch-prefix-parameter-interfaces.yaml
index ccb7b51eb7a..44fdfacbc27 100644
--- a/bin/configs/unmaintained/typescript-fetch-prefix-parameter-interfaces.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-prefix-parameter-interfaces.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
prefixParameterInterfaces: true
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-fetch-sagas-and-records.yaml b/bin/configs/unmaintained/typescript-fetch-sagas-and-records.yaml
index 7852f487742..4f67d98d14d 100644
--- a/bin/configs/unmaintained/typescript-fetch-sagas-and-records.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-sagas-and-records.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/sagas-and-records
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
useSingleRequestParameter: false
supportsES6: true
diff --git a/bin/configs/unmaintained/typescript-fetch-with-interfaces.yaml b/bin/configs/unmaintained/typescript-fetch-with-interfaces.yaml
index 926edb431d9..39ce0f3b5b7 100644
--- a/bin/configs/unmaintained/typescript-fetch-with-interfaces.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-with-interfaces.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/with-interfaces
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
withInterfaces: "true"
diff --git a/bin/configs/unmaintained/typescript-fetch-with-npm-version.yaml b/bin/configs/unmaintained/typescript-fetch-with-npm-version.yaml
index cd669c5e0d2..8084b095b02 100644
--- a/bin/configs/unmaintained/typescript-fetch-with-npm-version.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-with-npm-version.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/with-npm-version
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-fetch-with-string-enums.yaml b/bin/configs/unmaintained/typescript-fetch-with-string-enums.yaml
index 5b88cbda1a0..67d06c6e851 100644
--- a/bin/configs/unmaintained/typescript-fetch-with-string-enums.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-with-string-enums.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/with-string-enums
-inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/enum.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-fetch/enum.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
stringEnums: true
diff --git a/bin/configs/unmaintained/typescript-fetch-without-runtime-checks.yaml b/bin/configs/unmaintained/typescript-fetch-without-runtime-checks.yaml
index 75b9744fd34..81181c3937c 100644
--- a/bin/configs/unmaintained/typescript-fetch-without-runtime-checks.yaml
+++ b/bin/configs/unmaintained/typescript-fetch-without-runtime-checks.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-fetch
outputDir: samples/client/petstore/typescript-fetch/builds/without-runtime-checks
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-fetch
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-fetch
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-fetch-petstore'
+ npmName: '@openapijsonschematools/typescript-fetch-petstore'
npmRepository: https://skimdb.npmjs.com/registry
withoutRuntimeChecks: true
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-inversify.yaml b/bin/configs/unmaintained/typescript-inversify.yaml
index 5c18d8533f8..4251b94de26 100644
--- a/bin/configs/unmaintained/typescript-inversify.yaml
+++ b/bin/configs/unmaintained/typescript-inversify.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-inversify
outputDir: samples/client/petstore/typescript-inversify
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-inversify
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-inversify
diff --git a/bin/configs/unmaintained/typescript-jquery-default.yaml b/bin/configs/unmaintained/typescript-jquery-default.yaml
index 088647a8adc..ca2573f8388 100644
--- a/bin/configs/unmaintained/typescript-jquery-default.yaml
+++ b/bin/configs/unmaintained/typescript-jquery-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-jquery
outputDir: samples/client/petstore/typescript-jquery/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-jquery
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-jquery
diff --git a/bin/configs/unmaintained/typescript-jquery-npm.yaml b/bin/configs/unmaintained/typescript-jquery-npm.yaml
index 387da120f3f..a5d4f8e4284 100644
--- a/bin/configs/unmaintained/typescript-jquery-npm.yaml
+++ b/bin/configs/unmaintained/typescript-jquery-npm.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-jquery
outputDir: samples/client/petstore/typescript-jquery/npm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-jquery
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-jquery
additionalProperties:
npmVersion: 0.0.1
- npmName: '@openapitools/jquery-typescript-petstore'
+ npmName: '@openapijsonschematools/jquery-typescript-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-nestjs-v6-provided-in-root.yaml b/bin/configs/unmaintained/typescript-nestjs-v6-provided-in-root.yaml
index d5ca0d52431..dd3ef920b85 100644
--- a/bin/configs/unmaintained/typescript-nestjs-v6-provided-in-root.yaml
+++ b/bin/configs/unmaintained/typescript-nestjs-v6-provided-in-root.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-nestjs
outputDir: samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-nestjs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-nestjs
additionalProperties:
nestVersion: 6.0.0
- "npmName": "@openapitools/typescript-nestjs-petstore"
+ "npmName": "@openapijsonschematools/typescript-nestjs-petstore"
"npmVersion": "1.0.0"
"npmRepository" : "https://skimdb.npmjs.com/registry"
"snapshot" : false
diff --git a/bin/configs/unmaintained/typescript-nestjs-v8-provided-in-root.yaml b/bin/configs/unmaintained/typescript-nestjs-v8-provided-in-root.yaml
index 16a957708c6..1e790563078 100644
--- a/bin/configs/unmaintained/typescript-nestjs-v8-provided-in-root.yaml
+++ b/bin/configs/unmaintained/typescript-nestjs-v8-provided-in-root.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-nestjs
outputDir: samples/client/petstore/typescript-nestjs-v8-provided-in-root/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-nestjs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-nestjs
additionalProperties:
nestVersion: 8.0.0
- "npmName": "@openapitools/typescript-nestjs-petstore"
+ "npmName": "@openapijsonschematools/typescript-nestjs-petstore"
"npmVersion": "1.0.0"
"npmRepository" : "https://skimdb.npmjs.com/registry"
"snapshot" : false
diff --git a/bin/configs/unmaintained/typescript-node-default.yaml b/bin/configs/unmaintained/typescript-node-default.yaml
index bdd6eea3cb5..70e68c948ce 100644
--- a/bin/configs/unmaintained/typescript-node-default.yaml
+++ b/bin/configs/unmaintained/typescript-node-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-node
outputDir: samples/client/petstore/typescript-node/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-node
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-node
diff --git a/bin/configs/unmaintained/typescript-node-npm.yaml b/bin/configs/unmaintained/typescript-node-npm.yaml
index b61450c0671..b24266543ba 100644
--- a/bin/configs/unmaintained/typescript-node-npm.yaml
+++ b/bin/configs/unmaintained/typescript-node-npm.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-node
outputDir: samples/client/petstore/typescript-node/npm
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-node
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-node
additionalProperties:
npmVersion: 0.0.1
- npmName: '@openapitools/node-typescript-petstore'
+ npmName: '@openapijsonschematools/node-typescript-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-redux-query-default.yaml b/bin/configs/unmaintained/typescript-redux-query-default.yaml
index 2cfab47ae96..f1c7fedd403 100644
--- a/bin/configs/unmaintained/typescript-redux-query-default.yaml
+++ b/bin/configs/unmaintained/typescript-redux-query-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-redux-query
outputDir: samples/client/petstore/typescript-redux-query/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-redux-query
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-redux-query
diff --git a/bin/configs/unmaintained/typescript-redux-query-with-npm-version.yaml b/bin/configs/unmaintained/typescript-redux-query-with-npm-version.yaml
index 1db6557857d..e0cf2cf7761 100644
--- a/bin/configs/unmaintained/typescript-redux-query-with-npm-version.yaml
+++ b/bin/configs/unmaintained/typescript-redux-query-with-npm-version.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-redux-query
outputDir: samples/client/petstore/typescript-redux-query/builds/with-npm-version
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-redux-query
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-redux-query
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-redux-query-petstore'
+ npmName: '@openapijsonschematools/typescript-redux-query-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-rxjs-default.yaml b/bin/configs/unmaintained/typescript-rxjs-default.yaml
index 9c68513400d..4ba6584d082 100644
--- a/bin/configs/unmaintained/typescript-rxjs-default.yaml
+++ b/bin/configs/unmaintained/typescript-rxjs-default.yaml
@@ -1,4 +1,4 @@
generatorName: typescript-rxjs
outputDir: samples/client/petstore/typescript-rxjs/builds/default
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-rxjs
diff --git a/bin/configs/unmaintained/typescript-rxjs-es6-target.yaml b/bin/configs/unmaintained/typescript-rxjs-es6-target.yaml
index 4889de95854..7cafaab3c17 100644
--- a/bin/configs/unmaintained/typescript-rxjs-es6-target.yaml
+++ b/bin/configs/unmaintained/typescript-rxjs-es6-target.yaml
@@ -1,10 +1,10 @@
generatorName: typescript-rxjs
outputDir: samples/client/petstore/typescript-rxjs/builds/es6-target
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-rxjs
additionalProperties:
npmVersion: 1.0.0
supportsES6: true
- npmName: '@openapitools/typescript-rxjs-petstore'
+ npmName: '@openapijsonschematools/typescript-rxjs-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-rxjs-with-npm-version.yaml b/bin/configs/unmaintained/typescript-rxjs-with-npm-version.yaml
index 6b528e60d87..f44475e9e86 100644
--- a/bin/configs/unmaintained/typescript-rxjs-with-npm-version.yaml
+++ b/bin/configs/unmaintained/typescript-rxjs-with-npm-version.yaml
@@ -1,9 +1,9 @@
generatorName: typescript-rxjs
outputDir: samples/client/petstore/typescript-rxjs/builds/with-npm-version
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-rxjs
additionalProperties:
npmVersion: 1.0.0
- npmName: '@openapitools/typescript-rxjs-petstore'
+ npmName: '@openapijsonschematools/typescript-rxjs-petstore'
npmRepository: https://skimdb.npmjs.com/registry
snapshot: false
diff --git a/bin/configs/unmaintained/typescript-rxjs-with-progress-subscriber.yaml b/bin/configs/unmaintained/typescript-rxjs-with-progress-subscriber.yaml
index b33f917ca44..5e5d3f844c5 100644
--- a/bin/configs/unmaintained/typescript-rxjs-with-progress-subscriber.yaml
+++ b/bin/configs/unmaintained/typescript-rxjs-with-progress-subscriber.yaml
@@ -1,6 +1,6 @@
generatorName: typescript-rxjs
outputDir: samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/typescript-rxjs
additionalProperties:
withProgressSubscriber: "true"
diff --git a/bin/configs/unmaintained/wsdl-schema.yaml b/bin/configs/unmaintained/wsdl-schema.yaml
index 29484b39dfe..1179c00b2ee 100644
--- a/bin/configs/unmaintained/wsdl-schema.yaml
+++ b/bin/configs/unmaintained/wsdl-schema.yaml
@@ -1,6 +1,6 @@
generatorName: wsdl-schema
outputDir: samples/schema/petstore/wsdl-schema
-inputSpec: modules/openapi-generator/src/test/resources/3_0/wsdl/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/wsdl-schema
+inputSpec: modules/openapi-json-schema-generator/src/test/resources/3_0/wsdl/petstore.yaml
+templateDir: modules/openapi-json-schema-generator/src/main/resources/wsdl-schema
additionalProperties:
hideGenerationTimestamp: "true"
diff --git a/bin/meta-codegen-kotlin.sh b/bin/meta-codegen-kotlin.sh
index 905334f5f9f..55a487fabec 100755
--- a/bin/meta-codegen-kotlin.sh
+++ b/bin/meta-codegen-kotlin.sh
@@ -35,6 +35,6 @@ fi
cd "${root}"/samples/meta-codegen-kotlin/lib && \
./gradlew --no-daemon shadowJar)
-ags2="generate -g myClientCodegen -i modules/openapi-generator/src/test/resources/2_0/petstore.json -o samples/meta-codegen-kotlin/usage $@"
+ags2="generate -g myClientCodegen -i modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.json -o samples/meta-codegen-kotlin/usage $@"
-java $JAVA_OPTS -cp ${root}/samples/meta-codegen-kotlin/lib/build/libs/my-client-codegen-openapi-generator-1.0-SNAPSHOT-all.jar:$executable org.openapitools.codegen.OpenAPIGenerator $ags2
\ No newline at end of file
+java $JAVA_OPTS -cp ${root}/samples/meta-codegen-kotlin/lib/build/libs/my-client-codegen-openapi-generator-1.0-SNAPSHOT-all.jar:$executable org.openapijsonschematools.codegen.OpenAPIGenerator $ags2
\ No newline at end of file
diff --git a/bin/meta-codegen.sh b/bin/meta-codegen.sh
index 84aab1ce6fe..80e86041ba3 100755
--- a/bin/meta-codegen.sh
+++ b/bin/meta-codegen.sh
@@ -24,4 +24,4 @@ java $JAVA_OPTS -jar $executable $ags
ags2="generate -g myClientCodegen -i modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.json -o samples/meta-codegen/usage $@"
-java $JAVA_OPTS -cp ${root}/samples/meta-codegen/lib/target/myClientCodegen-openapi-generator-1.0.0.jar:$executable org.openapitools.codegen.OpenAPIGenerator $ags2
+java $JAVA_OPTS -cp ${root}/samples/meta-codegen/lib/target/myClientCodegen-openapi-generator-1.0.0.jar:$executable org.openapijsonschematools.codegen.OpenAPIGenerator $ags2
diff --git a/bin/tests/test-debug-supporting-files.sh b/bin/tests/test-debug-supporting-files.sh
index cd130225b4a..7cc5028c7e4 100755
--- a/bin/tests/test-debug-supporting-files.sh
+++ b/bin/tests/test-debug-supporting-files.sh
@@ -27,7 +27,7 @@ fi
# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties -DdebugSupportingFiles=true"
-ags="generate -t modules/openapi-generator/src/main/resources/python -i modules/openapi-generator/src/test/resources/3_0/issue_241.yaml -g python -o /tmp/test-debug-supporting-files/ --additional-properties packageName=petstore_api $@"
+ags="generate -t modules/openapi-json-schema-generator/src/main/resources/python -i modules/openapi-json-schema-generator/src/test/resources/3_0/issue_241.yaml -g python -o /tmp/test-debug-supporting-files/ --additional-properties packageName=petstore_api $@"
if [[ $(java $JAVA_OPTS -jar $executable $ags 2>&1 | grep "StackOverflowError") ]]; then
echo "There are StackOverflowError. Please check the result."
diff --git a/bin/utils/detect_carriage_return.sh b/bin/utils/detect_carriage_return.sh
index d3281f58468..7548ac7ef9d 100755
--- a/bin/utils/detect_carriage_return.sh
+++ b/bin/utils/detect_carriage_return.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# grep for \r in the templates
-grep -RUIl $'\r$' modules/openapi-generator/src/main/resources/*
+grep -RUIl $'\r$' modules/openapi-json-schema-generator/src/main/resources/*
if [ $? -ne 1 ]; then
echo "Templates contain carriage return '/r'. Please remove it and try again."
@@ -10,7 +10,7 @@ fi
# grep for \r in the generators
-grep -RUIl $'\r$' modules/openapi-generator/src/main/java/org/openapitools/codegen/*.java
+grep -RUIl $'\r$' modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/*.java
if [ $? -ne 1 ]; then
echo "Generators contain carriage return '/r'. Please remove it and try again."
diff --git a/bin/utils/detect_merge_conflict.sh b/bin/utils/detect_merge_conflict.sh
index 84e4d3c42d4..c40b64ae1cf 100755
--- a/bin/utils/detect_merge_conflict.sh
+++ b/bin/utils/detect_merge_conflict.sh
@@ -1,10 +1,10 @@
#!/bin/bash
# grep for '<<<<<<< HEAD' in openapi-generator
-grep -RUIl '<<<<<<< HEAD' modules/openapi-generator/src
+grep -RUIl '<<<<<<< HEAD' modules/openapi-json-schema-generator/src
if [ $? -ne 1 ]; then
- echo "modules/openapi-generator/src contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again."
+ echo "modules/openapi-json-schema-generator/src contain merge conflicts '<<<<<<< HEAD'. Please remove it and try again."
exit 1;
fi
diff --git a/bin/utils/detect_tab_in_templates.sh b/bin/utils/detect_tab_in_templates.sh
index e3ac60b104d..5499e089c31 100755
--- a/bin/utils/detect_tab_in_templates.sh
+++ b/bin/utils/detect_tab_in_templates.sh
@@ -4,13 +4,13 @@
# as these tabs should be replaced with 4-space instead
## declare an array of folders
-declare -a samples=("modules/openapi-generator/src/main/resources/kotlin-server"
- "modules/openapi-generator/src/main/resources/kotlin-spring"
- "modules/openapi-generator/src/main/resources/dart-dio"
- "modules/openapi-generator/src/main/resources/dart"
- "modules/openapi-generator/src/main/resources/dart2"
- "modules/openapi-generator/src/main/resources/aspnetcore"
- "modules/openapi-generator/src/main/resources/powershell"
+declare -a samples=("modules/openapi-json-schema-generator/src/main/resources/kotlin-server"
+ "modules/openapi-json-schema-generator/src/main/resources/kotlin-spring"
+ "modules/openapi-json-schema-generator/src/main/resources/dart-dio"
+ "modules/openapi-json-schema-generator/src/main/resources/dart"
+ "modules/openapi-json-schema-generator/src/main/resources/dart2"
+ "modules/openapi-json-schema-generator/src/main/resources/aspnetcore"
+ "modules/openapi-json-schema-generator/src/main/resources/powershell"
)
## now loop through the above array
diff --git a/bin/utils/openapi-generator-cli.sh b/bin/utils/openapi-generator-cli.sh
index ca65f20b5df..3f8d3402c6a 100644
--- a/bin/utils/openapi-generator-cli.sh
+++ b/bin/utils/openapi-generator-cli.sh
@@ -36,8 +36,8 @@ function latest.tag {
echo $ver
}
-ghrepo=openapitools/openapi-generator
-groupid=org.openapitools
+ghrepo=openapi-json-schema-tools/openapi-json-schema-generator
+groupid=org.openapijsonschematools
artifactid=openapi-generator-cli
ver=${OPENAPI_GENERATOR_VERSION:-$(latest.tag $ghrepo)}
diff --git a/bin/utils/release/release_version_update.sh b/bin/utils/release/release_version_update.sh
index 9026c07afbd..bcefcc51452 100755
--- a/bin/utils/release/release_version_update.sh
+++ b/bin/utils/release/release_version_update.sh
@@ -76,8 +76,7 @@ declare -a xml_files=(
"${root}/modules/openapi-generator-gradle-plugin/pom.xml"
"${root}/modules/openapi-generator-core/pom.xml"
"${root}/modules/openapi-generator-maven-plugin/pom.xml"
- "${root}/modules/openapi-generator-online/pom.xml"
- "${root}/modules/openapi-generator/pom.xml"
+ "${root}/modules/openapi-json-schema-generator/pom.xml"
"${root}/modules/openapi-generator-gradle-plugin/gradle.properties"
"${root}/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties"
"${root}/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml"
diff --git a/bin/utils/release_checkout.rb b/bin/utils/release_checkout.rb
index 83e0fd832a0..32eca3aab34 100755
--- a/bin/utils/release_checkout.rb
+++ b/bin/utils/release_checkout.rb
@@ -6,73 +6,10 @@
require 'open-uri'
require 'net/http'
-def check_sbt_openapi_generator
- print "Checking sbt-openapi-generator... "
-
- url = "https://raw.githubusercontent.com/OpenAPITools/sbt-openapi-generator/master/build.sbt"
- open(url) do |f|
- content = f.read
- if !content.nil? && content.include?($version)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not yet updated with #{$version}"
- end
- end
-end
-
-def check_npmjs
- print "Checking npmjs... "
-
- url = "https://www.npmjs.com/package/@openapitools/openapi-generator-cli?activeTab=versions"
- open(url) do |f|
- content = f.read
- if !content.nil? && content.include?($version)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not yet updated with #{$version}"
- end
- end
-end
-
-def check_homebrew
- print "Checking homebrew formula ... "
-
- url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/openapi-generator.rb"
- new_maven_url = "https://search.maven.org/remotecontent?filepath=org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"
- open(url) do |f|
- content = f.read
- if !content.nil? && content.include?(new_maven_url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not yet updated with #{new_maven_url}"
- end
- end
-end
-
-def check_openapi_generator_online_docker
- print "Checking openapi-generator-online docker ... "
-
- url = "https://hub.docker.com/v2/repositories/openapitools/openapi-generator-online/tags/?page_size=25&page=1"
-
- docker_tag = "v#{$version}"
- open(url) do |f|
- content = f.read
- if !content.nil? && content.include?(docker_tag)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} does not have tag #{docker_tag}"
- end
- end
-end
-
def check_openapi_generator_cli_docker
print "Checking openapi-generator-cli docker ... "
- url = "https://hub.docker.com/v2/repositories/openapitools/openapi-generator-cli/tags/?page_size=25&page=1"
+ url = "https://hub.docker.com/v2/repositories/openapi-json-schema-tools/openapi-json-schema-generator-cli/tags/?page_size=25&page=1"
docker_tag = "v#{$version}"
open(url) do |f|
content = f.read
@@ -85,112 +22,6 @@ def check_openapi_generator_cli_docker
end
end
-def check_readme
- print "Checking openapi-generator README.md ... "
-
- url = "https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/README.md"
- matches = ["[#{$version}](https://github.com/OpenAPITools/openapi-generator/releases/tag/v#{$version})",
- "JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar`",
- "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar -O openapi-generator-cli.jar",
- "Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"]
- open(url) do |f|
- content = f.read
- has_outdated = false
- not_matched = []
- matches.each do |match|
- if !content.nil? && content.include?(match)
- # matched
- else
- has_outdated = true
- not_matched << match
- end
- end
-
- if has_outdated
- puts "[ERROR]"
- not_matched.each do |str|
- puts "> '#{str}' not found in README.md"
- end
- else
- puts "[OK]"
- end
- end
-end
-
-def check_openapi_generator_jar
- print "Checking openapi-generator JAR ... "
- url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator/#{$version}/openapi-generator-#{$version}.jar"
-
- if check_url(url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not found"
- end
-
-end
-
-
-def check_openapi_generator_cli_jar
- print "Checking openapi-generator-cli JAR ... "
- url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/#{$version}/openapi-generator-cli-#{$version}.jar"
-
- if check_url(url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not found"
- end
-end
-
-def check_openapi_generator_maven_plugin_jar
- print "Checking openapi-generator-maven-plugin JAR ... "
- url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-maven-plugin/#{$version}/openapi-generator-maven-plugin-#{$version}.jar"
-
- if check_url(url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not found"
- end
-end
-
-def check_openapi_generator_gradle_plugin_jar
- print "Checking openapi-generator-gradle-plugin JAR ... "
- url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-gradle-plugin/#{$version}/openapi-generator-gradle-plugin-#{$version}.jar"
-
- if check_url(url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not found"
- end
-end
-
-def check_openapi_generator_online_jar
- print "Checking openapi-generator-online JAR ... "
- url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-online/#{$version}/openapi-generator-online-#{$version}.jar"
-
- if check_url(url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not found"
- end
-end
-
-def check_openapi_generator_project_pom
- print "Checking openapi-generator-project pom.xml ... "
- url = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-project/#{$version}/openapi-generator-project-#{$version}.pom"
-
- if check_url(url)
- puts "[OK]"
- else
- puts "[ERROR]"
- puts "> #{url} not found"
- end
-end
-
def check_url url
content = Net::HTTP.get(URI.parse(url))
url = URI.parse(url)
@@ -219,15 +50,4 @@ def usage
puts "Running checkout on OpenAPI Generator release #{$version}"
-check_sbt_openapi_generator
-check_openapi_generator_online_docker
check_openapi_generator_cli_docker
-check_npmjs
-check_homebrew
-check_openapi_generator_jar
-check_openapi_generator_cli_jar
-check_openapi_generator_maven_plugin_jar
-check_openapi_generator_gradle_plugin_jar
-check_openapi_generator_online_jar
-check_openapi_generator_project_pom
-check_readme
diff --git a/bin/utils/test-fake-petstore-for-all.sh b/bin/utils/test-fake-petstore-for-all.sh
index 1ec62890c3b..0a3bc219478 100755
--- a/bin/utils/test-fake-petstore-for-all.sh
+++ b/bin/utils/test-fake-petstore-for-all.sh
@@ -12,21 +12,21 @@ logfile="/tmp/generator-fake-petstore-output.log"
for GENERATOR in $(java -jar ${executable} list --short | sed -e 's/,/\'$'\n''/g')
do
# no longer test 2.0 spec as we migrated to 3.0 spec
- #if eval java -jar ${executable} generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/2.0/${GENERATOR} > ${logfile} 2>&1; then
+ #if eval java -jar ${executable} generate -i modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/2.0/${GENERATOR} > ${logfile} 2>&1; then
# echo "[OAS 2.0] Executed ${GENERATOR} successfully!"
#else
# echo "ERROR: Failed to run '${GENERATOR}' generator. The command was:"
- # echo "java -jar ${executable} generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/2.0/${GENERATOR}"
+ # echo "java -jar ${executable} generate -i modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/2.0/${GENERATOR}"
# echo "ERROR: The output of the command was:"
# cat ${logfile}
# exit 1
#fi
- if eval java -jar ${executable} generate -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/3.0/${GENERATOR} > ${logfile} 2>&1; then
+ if eval java -jar ${executable} generate -i modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/3.0/${GENERATOR} > ${logfile} 2>&1; then
echo "[OAS 3.0] Executed ${GENERATOR} successfully!"
else
echo "ERROR: Failed to run '${GENERATOR}' generator. The command was:"
- echo "java -jar ${executable} generate -i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/3.0/${GENERATOR}"
+ echo "java -jar ${executable} generate -i modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g ${GENERATOR} -o /tmp/openapi-generator-test-fake-petstore/3.0/${GENERATOR}"
echo "ERROR: The output of the command was:"
cat ${logfile}
exit 1
diff --git a/docs/building.md b/docs/building.md
index 9e91349812c..e8ae653b571 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -31,7 +31,7 @@ in the docker container. It also maps `~/.m2/repository` to the appropriate cont
To execute `mvn package`:
```bash
-git clone https://github.com/openapitools/openapi-generator
+git clone https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
cd openapi-generator
./run-in-docker.sh mvn package
```
@@ -53,7 +53,7 @@ Once built, `run-in-docker.sh` will act as an executable for openapi-generator-c
Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
```bash
-git clone https://github.com/openapitools/openapi-generator.git
+git clone https://github.com/openapi-json-schema-tools/openapi-json-schema-generator.git
cd openapi-generator
vagrant up
vagrant ssh
diff --git a/docs/conduct.md b/docs/conduct.md
index dfaf2b72b7d..d2fcc83749e 100644
--- a/docs/conduct.md
+++ b/docs/conduct.md
@@ -37,7 +37,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
## 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.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at team@openapijsonschematools.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.
diff --git a/docs/contributing.md b/docs/contributing.md
index d7ed41b04d9..660902e2f78 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -6,16 +6,16 @@ sidebar_label: Guidelines
## 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. Failure to provide enough detail may result in slow response from the community.
+ - 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/openapi-json-schema-tools/openapi-json-schema-generator#getting-started)
+ - Search the [open issue](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues) and [closed issue](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues?q=is%3Aissue+is%3Aclosed) to ensure no one else has reported something similar before.
+ - File an [issue ticket](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues/new) by providing all the required information. Failure to provide enough detail may result in slow response from the community.
- 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/openapi-json-schema-tools/openapi-json-schema-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/openapi-json-schema-tools/openapi-json-schema-generator/issues) with your suggestion to gather feedback from the community.
- If you're adding a new option to a generator, please consider using the `-t` option with customized templates instead or start a discussion first by opening an issue as we want to avoid adding too many options to the generator.
- It's recommended to **create a new git branch** for the change so that the merge commit message looks nicer in the commit history.
@@ -25,7 +25,7 @@ sidebar_label: Guidelines
If you're new to git, you may find the following FAQs useful:
-https://github.com/openapitools/openapi-generator/wiki/FAQ#git
+https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/wiki/FAQ#git
### Branches
@@ -33,15 +33,15 @@ Please file the pull request against the correct branch, e.g. `master` for non-b
### 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/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages)
If you want to add a new generator, follow the [new-generator](https://openapi-generator.tech/docs/new-generator) guide.
### 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/openapi-generator/src/main/resources](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/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/openapi-json-schema-tools/openapi-json-schema-generator/wiki/Mustache-Template-Variables)
### Style guide
@@ -84,15 +84,15 @@ 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/openapi-json-schema-tools/openapi-json-schema-generator/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/openapi-generator/src/test/java/org/openapijsonschematools/codegen](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/src/test/java/org/openapijsonschematools/codegen)
To test the templates, please perform the following:
-- Update the Petstore sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh ./bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapitools/openapi-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (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 sample by running the shell scripts under the `bin` folder. For example, run `./bin/generate-samples.sh ./bin/configs/python*` to update the Python-related samples under [`samples`](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples). For Windows, please install [GIT bash](https://gitforwindows.org/). (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)
- During development, it can be helpful to quickly regenerate the samples without recompiling all of openapi-generator, e.g. when you have only updated the mustache templates. This can be done by passing the `-t` parameter: `-t modules/openapi-generator/src/main/resources/python`.
- Run the tests in the sample folder using maven `mvn integration-test -f /path/to/pom.xml`, e.g. `mvn integration-test -f samples/client/petstore/python/pom.xml`. (some languages may not contain unit testing for Petstore and we're looking for contribution from the community to implement those tests). __Please notice:__ you must run a local instance of the Petstore server in order to perform the tests, as running them against petstore.swagger.io is not supported anymore. Please refer to item 3 of [Integration Tests - How to add integration tests for new Petstore samples](https://github.com/OpenAPITools/openapi-generator/wiki/Integration-Tests#how-to-add-integration-tests-for-new-petstore-samples) to learn how to quickly configure and run it.
- Finally, git commit the updated samples files: `git commit -a` (`git add -A` if added files with new test cases)
diff --git a/docs/customization.md b/docs/customization.md
index 39d45c3834e..3401930dd38 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -99,28 +99,28 @@ If you are running a Windows Subsystem for Linux or a shell such as gitbash, and
Now, execute the generator:
```sh
-java -cp out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar org.openapitools.codegen.OpenAPIGenerator
+java -cp out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar OpenAPIGenerator
```
For Windows users, you will need to use `;` instead of `:` in the classpath, e.g.
```
-java -cp "out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.jar;modules/openapi-generator-cli/target/openapi-generator-cli.jar" org.openapitools.codegen.OpenAPIGenerator
+java -cp "out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.jar;modules/openapi-generator-cli/target/openapi-generator-cli.jar" OpenAPIGenerator
```
Note the `my-codegen` is an option for `-g` now, and you can use the usual arguments for generating your code:
```sh
java -cp out/generators/my-codegen/target/my-codegen-openapi-generator-1.0.0.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar \
- org.openapitools.codegen.OpenAPIGenerator generate -g my-codegen \
- -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+ OpenAPIGenerator generate -g my-codegen \
+ -i https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-o ./out/myClient
```
For Windows users:
```
java -cp "out/codegens/customCodegen/target/my-codegen-openapi-generator-1.0.0.jar;modules/openapi-generator-cli/target/openapi-generator-cli.jar" \
- org.openapitools.codegen.OpenAPIGenerator generate -g my-codegen \
- -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+ OpenAPIGenerator generate -g my-codegen \
+ -i https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-o ./out/myClient
```
@@ -132,13 +132,13 @@ Install your library to your local maven repository by running:
mvn clean install -f out/generators/my-codegen
```
-This will install `org.openapitools:my-codegen-openapi-generator:1.0.0` to your local maven repository.
+This will install `org.openapijsonschematools:my-codegen-openapi-generator:1.0.0` to your local maven repository.
You can use this as additional dependency of the `openapi-generator-maven-plugin` plugin and use `my-codegen` as `generatorName` value:
```xml
- org.openapitools
+ org.openapijsonschematoolsopenapi-generator-maven-plugin${openapi-generator-version}
@@ -155,7 +155,7 @@ You can use this as additional dependency of the `openapi-generator-maven-plugin
- org.openapitools
+ org.openapijsonschematoolsmy-codegen-openapi-generator1.0.0
@@ -271,7 +271,7 @@ Editor support for `.openapi-generator-ignore` files is available in IntelliJ vi
There are different aspects of customizing the code generator beyond just creating or modifying templates. Each language has a supporting configuration file to handle different type mappings, etc:
```sh
-$ ls -1 modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/
+$ ls -1 modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/
AbstractJavaJAXRSServerCodegen.java
AbstractTypeScriptClientCodegen.java
... (results omitted)
@@ -283,7 +283,7 @@ Each of these files creates reasonable defaults so you can get running quickly.
```sh
java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
- -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
+ -i https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
-g java \
-o samples/client/petstore/java \
-c path/to/config.json
@@ -300,7 +300,7 @@ apiPackage: "petstore"
```
Supported config options can be different per language. Running `config-help -g {lang}` will show available options.
-**These options are applied via configuration file (e.g. config.json or config.yml) or by passing them with `-p {optionName}={optionValue}`**. (If `-p {optionName}` does not work, please open a [ticket](https://github.com/openapitools/openapi-generator/issues/new) and we'll look into it)
+**These options are applied via configuration file (e.g. config.json or config.yml) or by passing them with `-p {optionName}={optionValue}`**. (If `-p {optionName}` does not work, please open a [ticket](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues/new) and we'll look into it)
```sh
java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar config-help -g java
@@ -354,9 +354,7 @@ Another way to override default options is to extend the config class for the sp
To change, for example, the prefix for the Objective-C generated files, simply subclass the `ObjcClientCodegen.java`:
```java
-package com.mycompany.openapitools.codegen;
-
-import org.openapitools.codegen.languages.*;
+package com.mycompany.openapijsonschematools.codegen;
public class MyObjcCodegen extends ObjcClientCodegen {
static {
@@ -368,7 +366,7 @@ public class MyObjcCodegen extends ObjcClientCodegen {
and specify the `classname` when running the generator:
```
--g com.mycompany.openapitools.codegen.MyObjcCodegen
+-g com.mycompany.openapijsonschematools.codegen.MyObjcCodegen
```
Your subclass will now be loaded and overrides the `PREFIX` value in the superclass.
diff --git a/docs/debugging.md b/docs/debugging.md
index bdf7e992c6e..5ab496788ac 100644
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -216,7 +216,7 @@ openapi-generator generate -g go ...
...
...
-[main] DEBUG o.o.codegen.DefaultCodegen - debugging fromProperty for files : class Schema {
+[main] DEBUG o.o.codegen.DefaultCodegen - debugging fromSchema for files : class Schema {
type: null
format: null
$ref: #/components/schemas/File
diff --git a/docs/faq-contributing.md b/docs/faq-contributing.md
index 704758bb443..c200eb497eb 100644
--- a/docs/faq-contributing.md
+++ b/docs/faq-contributing.md
@@ -29,7 +29,7 @@ Then add the following to your local [hosts](https://en.wikipedia.org/wiki/Hosts
## Who should I report a security vulnerability to?
-Please contact team@openapitools.org with the details and we'll follow up with you.
+Please contact team@openapijsonschematools.org with the details and we'll follow up with you.
## How can I rebase my PR on the latest master?
@@ -43,7 +43,7 @@ Please refer to http://rypress.com/tutorials/git/rebasing, or follow the steps b
5. Resolve merge conflicts, if any, and run "git commit -a"
6. Rebase done (you may need to add --force when doing `git push`)
-(To setup `upstream` pointing to the official repo, please run `git remote add upstream https://github.com/openapitools/openapi-generator.git`)
+(To setup `upstream` pointing to the official repo, please run `git remote add upstream https://github.com/openapi-json-schema-tools/openapi-json-schema-generator.git`)
## How can I update commits that are not linked to my GitHub account?
@@ -55,7 +55,7 @@ Yes, http://www.alexkras.com/19-git-tips-for-everyday-use/
## How can I submit a PR to fix bugs or make enhancements?
-Visit https://github.com/openapitools/openapi-generator and then click on the "Fork" button in the upper right corner. Then in your local machine, run the following (assuming your github ID is "your_user_id")
+Visit https://github.com/openapi-json-schema-tools/openapi-json-schema-generator and then click on the "Fork" button in the upper right corner. Then in your local machine, run the following (assuming your github ID is "your_user_id")
1) git clone https://github.com/your_user_id/openapi-generator.git
2) cd openapi-generator
@@ -63,4 +63,4 @@ Visit https://github.com/openapitools/openapi-generator and then click on the "F
4) make changes
5) git commit -a (you may need to use `git add filename` to add new files)
6) git push origin fix_issue9999
-7) Visit https://github.com/openapitools/openapi-generator in your browser and click on the button to file a new PR based on fix_issue9999
+7) Visit https://github.com/openapi-json-schema-tools/openapi-json-schema-generator in your browser and click on the button to file a new PR based on fix_issue9999
diff --git a/docs/faq-generators.md b/docs/faq-generators.md
index 370130dbe11..8a001bf6cb6 100644
--- a/docs/faq-generators.md
+++ b/docs/faq-generators.md
@@ -75,7 +75,7 @@ The warning has no impact on the build process so you should be able to build th
Here are the steps:
```
-git clone https://github.com/openapitools/openapi-generator.git
+git clone https://github.com/openapi-json-schema-tools/openapi-json-schema-generator.git
cd openapi-generator/samples/client/petstore/objc/default/OpenAPIClientTests
mvn integration-test
```
@@ -88,13 +88,13 @@ Besides `default` (folder) ObjC API client, there's also `core-data` for another
Here are the steps:
```
-git clone https://github.com/openapitools/openapi-generator.git
+git clone https://github.com/openapi-json-schema-tools/openapi-json-schema-generator.git
cd openapi-generator/samples/client/petstore/swift/default/OpenAPIClientTests
mvn integration-test
```
Besides `default` (folder), there's another folder `promisekit` for Swift API client with [PromiseKit support](https://github.com/mxcl/PromiseKit)
```
-git clone https://github.com/openapitools/openapi-generator.git
+git clone https://github.com/openapi-json-schema-tools/openapi-json-schema-generator.git
cd openapi-generator/samples/client/petstore/swift/promisekit/OpenAPIClientTests
mvn integration-test
```
diff --git a/docs/file-post-processing.md b/docs/file-post-processing.md
index a23845adae2..cc63b5c7c41 100644
--- a/docs/file-post-processing.md
+++ b/docs/file-post-processing.md
@@ -48,7 +48,7 @@ Let's see how to pass Ruby generated files to Rubocop, a static code analysis/li
# First, export the required environment variable
export RUBY_POST_PROCESS_FILE="/usr/local/bin/rubocop -a"
-export OPENAPI_DOC="https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
+export OPENAPI_DOC="https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
# Invoke the generator with --enable-post-process-file
openapi-generator generate --enable-post-process-file -i $OPENAPI_DOC -g ruby -o .out-ruby/
diff --git a/docs/generators/java.md b/docs/generators/java.md
index d755225ec40..f9fada54409 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -21,10 +21,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|additionalEnumTypeAnnotations|Additional annotations for enum type(class level annotations)| |null|
|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|apiPackage|package for generated api classes| |org.openapitools.client.api|
+|apiPackage|package for generated api classes| |org.openapijsonschematools.client.api|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-java-client|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapi-json-schema-tools/openapi-json-schema-generator|
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|asyncNative|If true, async handlers will be used, instead of the sync version| |false|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
@@ -32,10 +32,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|caseInsensitiveResponseHeaders|Make API response's headers case-insensitive. Available on okhttp-gson, jersey2 libraries| |false|
|configKey|Config key in @RegisterRestClient. Default to none. Only `microprofile` supports this option.| |null|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerEmail|developer email in generated pom.xml| |team@openapijsonschematools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
+|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapijsonschematools.org|
|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
|discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
@@ -45,19 +45,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|errorObjectType|Error Object type. (This option is for okhttp-gson-next-gen only)| |null|
|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
|gradleProperties|Append additional Gradle properties to the gradle.properties file| |null|
-|groupId|groupId in generated pom.xml| |org.openapitools|
+|groupId|groupId in generated pom.xml| |org.openapijsonschematools|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
|ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
|implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false|
|implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
-|invokerPackage|root package for generated code| |org.openapitools.client|
-|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
+|invokerPackage|root package for generated code| |org.openapijsonschematools.client|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendant schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendant schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
|library|library template (sub-template) to use|
**jersey1**
HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey3' or other HTTP libraries instead.
**jersey2**
HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x
**jersey3**
HTTP client: Jersey client 3.x. JSON processing: Jackson 2.x
**feign**
HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.
**okhttp-gson**
[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.
**retrofit2**
HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)
**resttemplate**
HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x
**webclient**
HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x
**resteasy**
HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x
**vertx**
HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x
**google-api-client**
HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x
**rest-assured**
HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8
**native**
HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+
|okhttp-gson|
|licenseName|The name of the license| |Unlicense|
|licenseUrl|The URL of the license| |http://unlicense.org|
|microprofileFramework|Framework for microprofile. Possible values "kumuluzee"| |null|
|microprofileRestClientVersion|Version of MicroProfile Rest Client API.| |null|
-|modelPackage|package for generated models| |org.openapitools.client.model|
+|modelPackage|package for generated models| |org.openapijsonschematools.client.model|
|openApiNullable|Enable OpenAPI Jackson Nullable library| |true|
|parcelableModel|Whether to generate models for Android that implement Parcelable with the okhttp-gson library.| |false|
|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
@@ -65,9 +65,9 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
|performBeanValidation|Perform BeanValidation| |false|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
-|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
-|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git|
+|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git|
+|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapi-json-schema-tools/openapi-json-schema-generator|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
|serializationLibrary|Serialization library, default depends on value of the option library|
**jsonb**
Use JSON-B as serialization library
**jackson**
Use Jackson as serialization library
**gson**
Use Gson as serialization library
|null|
|snapshotVersion|Uses a SNAPSHOT version.|
**true**
Use a SnapShot Version
**false**
Use a Release Version
|null|
@@ -103,29 +103,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|x-webclient-blocking|Specifies if method for specific operation should be blocking or non-blocking(ex: return `Mono/Flux` or `return T/List/Set` & execute `.block()` inside generated method)|OPERATION|false
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-|Array|java.util.List|
-|ArrayList|java.util.ArrayList|
-|BigDecimal|java.math.BigDecimal|
-|Date|java.util.Date|
-|DateTime|org.joda.time.*|
-|File|java.io.File|
-|HashMap|java.util.HashMap|
-|LinkedHashSet|java.util.LinkedHashSet|
-|List|java.util.*|
-|LocalDate|org.joda.time.*|
-|LocalDateTime|org.joda.time.*|
-|LocalTime|org.joda.time.*|
-|Map|java.util.Map|
-|Set|java.util.*|
-|Timestamp|java.sql.Timestamp|
-|URI|java.net.URI|
-|UUID|java.util.UUID|
-
-
## INSTANTIATION TYPES
| Type/Alias | Instantiated By |
@@ -237,15 +214,30 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|UserAgent|✗|ToolingExtension
|MockServer|✗|ToolingExtension
+### Components Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|schemas|✗|OAS3
+|responses|✗|OAS3
+|parameters|✗|OAS3
+|examples|✗|OAS3
+|requestBodies|✗|OAS3
+|headers|✗|OAS3
+|securitySchemes|✗|OAS3
+|links|✗|OAS3
+|callbacks|✗|OAS3
+|pathItems|✗|OAS3
+
### Data Type Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Custom|✗|OAS2,OAS3
|Int32|✓|OAS2,OAS3
|Int64|✓|OAS2,OAS3
+|Integer|✗|OAS2,OAS3
|Float|✓|OAS2,OAS3
|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
+|Number|✗|OAS2,OAS3
|String|✓|OAS2,OAS3
|Byte|✓|OAS2,OAS3
|Binary|✓|OAS2,OAS3
@@ -254,82 +246,109 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|DateTime|✓|OAS2,OAS3
|Password|✓|OAS2,OAS3
|File|✓|OAS2
-|Uuid|✗|
+|Uuid|✗|OAS2,OAS3
|Array|✓|OAS2,OAS3
|Null|✗|OAS3
|AnyType|✗|OAS2,OAS3
|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
### Documentation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Readme|✓|ToolingExtension
-|Model|✓|ToolingExtension
+|Servers|✗|OAS3
+|Security|✗|OAS2,OAS3
+|ComponentSchemas|✓|OAS3
+|ComponentResponses|✗|OAS3
+|ComponentParameters|✗|OAS3
+|ComponentRequestBodies|✗|OAS3
+|ComponentHeaders|✗|OAS3
+|ComponentSecuritySchemes|✗|OAS3
+|ComponentLinks|✗|OAS3
+|ComponentCallbacks|✗|OAS3
+|ComponentPathItems|✗|OAS3
|Api|✓|ToolingExtension
### Global Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✓|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✗|OAS3
-|LinkObjects|✗|OAS3
+|Servers|✗|OAS3
+|Paths|✗|OAS2,OAS3
+|Webhooks|✗|OAS3
+|Components|✓|OAS3
+|Security|✗|OAS2,OAS3
+|Tags|✗|OAS2,OAS3
+|ExternalDocs|✗|OAS2,OAS3
+
+### Operation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Responses_HttpStatusCode|✓|OAS3
+|Responses_RangedResponseCodes|✗|OAS3
+|Responses_Default|✓|OAS3
+|Responses_RedirectionResponse|✗|OAS3
### Parameter Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✓|OAS3
+|Name|✗|OAS2,OAS3
+|Required|✗|OAS2,OAS3
+|In_Path|✓|OAS2,OAS3
+|In_Query|✓|OAS2,OAS3
+|In_Header|✓|OAS2,OAS3
+|In_Cookie|✓|OAS3
+|Style_Matrix|✗|OAS3
+|Style_Label|✗|OAS3
+|Style_Form|✗|OAS3
+|Style_Simple|✗|OAS3
+|Style_SpaceDelimited|✗|OAS3
+|Style_PipeDelimited|✗|OAS3
+|Style_DeepObject|✗|OAS3
+|Explode|✗|OAS3
+|Schema|✗|OAS3
+|Content|✗|OAS3
-### Schema Support Feature
+### Schema Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✗|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
+|AdditionalProperties|✗|OAS2,OAS3
+|AllOf|✗|OAS2,OAS3
+|AnyOf|✗|OAS3
+|Default|✗|OAS2,OAS3
+|Discriminator|✓|OAS2,OAS3
+|Enum|✓|OAS2,OAS3
+|ExclusiveMinimum|✓|OAS2,OAS3
+|ExclusiveMaximum|✓|OAS2,OAS3
+|Format|✓|OAS2,OAS3
+|Items|✓|OAS2,OAS3
+|MaxItems|✓|OAS2,OAS3
+|MaxLength|✓|OAS2,OAS3
+|MaxProperties|✓|OAS2,OAS3
+|Maximum|✓|OAS2,OAS3
+|MinItems|✓|OAS2,OAS3
+|MinLength|✓|OAS2,OAS3
+|MinProperties|✓|OAS2,OAS3
+|Minimum|✓|OAS2,OAS3
+|MultipleOf|✓|OAS2,OAS3
+|Not|✗|OAS3
+|Nullable|✗|OAS3
+|OneOf|✗|OAS3
+|Pattern|✓|OAS2,OAS3
+|Properties|✓|OAS2,OAS3
+|Required|✓|OAS2,OAS3
+|Type|✓|OAS2,OAS3
+|UniqueItems|✓|OAS2,OAS3
+|Xml|✗|OAS2,OAS3
### Security Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|BasicAuth|✗|OAS2,OAS3
+|HTTP_Basic|✗|OAS2,OAS3
|ApiKey|✗|OAS2,OAS3
|OpenIDConnect|✗|OAS3
-|BearerToken|✗|OAS3
+|HTTP_Bearer|✗|OAS2,OAS3
|OAuth2_Implicit|✗|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 995d4e2a884..a04452cd13f 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -21,44 +21,44 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|additionalEnumTypeAnnotations|Additional annotations for enum type(class level annotations)| |null|
|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null|
|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|apiPackage|package for generated api classes| |org.openapitools.api|
+|apiPackage|package for generated api classes| |org.openapijsonschematools.api|
|artifactDescription|artifact description in generated pom.xml| |OpenAPI Java|
|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |openapi-jaxrs-server|
-|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|artifactUrl|artifact URL in generated pom.xml| |https://github.com/openapi-json-schema-tools/openapi-json-schema-generator|
|artifactVersion|artifact version in generated pom.xml. This also becomes part of the generated library's filename| |1.0.0|
|bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false|
|booleanGetterPrefix|Set booleanGetterPrefix| |get|
|dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy|
-|developerEmail|developer email in generated pom.xml| |team@openapitools.org|
+|developerEmail|developer email in generated pom.xml| |team@openapijsonschematools.org|
|developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors|
|developerOrganization|developer organization in generated pom.xml| |OpenAPITools.org|
-|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapitools.org|
+|developerOrganizationUrl|developer organization URL in generated pom.xml| |http://openapijsonschematools.org|
|disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
|discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false|
|fullJavaUtil|whether to use fully qualified name for classes under java.util. This option only works for Java API client| |false|
-|groupId|groupId in generated pom.xml| |org.openapitools|
+|groupId|groupId in generated pom.xml| |org.openapijsonschematools|
|hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
|ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
|implFolder|folder for generated implementation code| |src/main/java|
|implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false|
|implicitHeadersRegex|Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true| |null|
-|invokerPackage|root package for generated code| |org.openapitools.api|
-|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
+|invokerPackage|root package for generated code| |org.openapijsonschematools.api|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendant schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendant schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
|library|library template (sub-template)|
**jersey1**
Jersey core 1.x
**jersey2**
Jersey core 2.x
|jersey2|
|licenseName|The name of the license| |Unlicense|
|licenseUrl|The URL of the license| |http://unlicense.org|
-|modelPackage|package for generated models| |org.openapitools.model|
+|modelPackage|package for generated models| |org.openapijsonschematools.model|
|openApiNullable|Enable OpenAPI Jackson Nullable library| |true|
|parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
|parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
|parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
-|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
-|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapitools/openapi-generator|
+|scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git|
+|scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapi-json-schema-tools/openapi-json-schema-generator.git|
+|scmUrl|SCM URL in generated pom.xml| |https://github.com/openapi-json-schema-tools/openapi-json-schema-generator|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |false|
|serverPort|The port on which the server should be started| |8080|
|snapshotVersion|Uses a SNAPSHOT version.|
**true**
Use a SnapShot Version
**false**
Use a Release Version
|null|
@@ -86,29 +86,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|x-field-extra-annotation|List of custom annotations to be added to property|FIELD|null
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-|Array|java.util.List|
-|ArrayList|java.util.ArrayList|
-|BigDecimal|java.math.BigDecimal|
-|Date|java.util.Date|
-|DateTime|org.joda.time.*|
-|File|java.io.File|
-|HashMap|java.util.HashMap|
-|LinkedHashSet|java.util.LinkedHashSet|
-|List|java.util.*|
-|LocalDate|org.joda.time.*|
-|LocalDateTime|org.joda.time.*|
-|LocalTime|org.joda.time.*|
-|Map|java.util.Map|
-|Set|java.util.*|
-|Timestamp|java.sql.Timestamp|
-|URI|java.net.URI|
-|UUID|java.util.UUID|
-
-
## INSTANTIATION TYPES
| Type/Alias | Instantiated By |
@@ -220,15 +197,30 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|UserAgent|✗|ToolingExtension
|MockServer|✗|ToolingExtension
+### Components Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|schemas|✗|OAS3
+|responses|✗|OAS3
+|parameters|✗|OAS3
+|examples|✗|OAS3
+|requestBodies|✗|OAS3
+|headers|✗|OAS3
+|securitySchemes|✗|OAS3
+|links|✗|OAS3
+|callbacks|✗|OAS3
+|pathItems|✗|OAS3
+
### Data Type Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Custom|✗|OAS2,OAS3
|Int32|✓|OAS2,OAS3
|Int64|✓|OAS2,OAS3
+|Integer|✗|OAS2,OAS3
|Float|✓|OAS2,OAS3
|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
+|Number|✗|OAS2,OAS3
|String|✓|OAS2,OAS3
|Byte|✓|OAS2,OAS3
|Binary|✓|OAS2,OAS3
@@ -237,82 +229,109 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|DateTime|✓|OAS2,OAS3
|Password|✓|OAS2,OAS3
|File|✓|OAS2
-|Uuid|✗|
+|Uuid|✗|OAS2,OAS3
|Array|✓|OAS2,OAS3
|Null|✗|OAS3
|AnyType|✗|OAS2,OAS3
|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
### Documentation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Readme|✓|ToolingExtension
-|Model|✓|ToolingExtension
+|Servers|✗|OAS3
+|Security|✗|OAS2,OAS3
+|ComponentSchemas|✓|OAS3
+|ComponentResponses|✗|OAS3
+|ComponentParameters|✗|OAS3
+|ComponentRequestBodies|✗|OAS3
+|ComponentHeaders|✗|OAS3
+|ComponentSecuritySchemes|✗|OAS3
+|ComponentLinks|✗|OAS3
+|ComponentCallbacks|✗|OAS3
+|ComponentPathItems|✗|OAS3
|Api|✓|ToolingExtension
### Global Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✗|OAS3
-|LinkObjects|✗|OAS3
+|Servers|✗|OAS3
+|Paths|✗|OAS2,OAS3
+|Webhooks|✗|OAS3
+|Components|✓|OAS3
+|Security|✗|OAS2,OAS3
+|Tags|✗|OAS2,OAS3
+|ExternalDocs|✗|OAS2,OAS3
+
+### Operation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Responses_HttpStatusCode|✓|OAS3
+|Responses_RangedResponseCodes|✗|OAS3
+|Responses_Default|✓|OAS3
+|Responses_RedirectionResponse|✗|OAS3
### Parameter Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✓|OAS3
+|Name|✗|OAS2,OAS3
+|Required|✗|OAS2,OAS3
+|In_Path|✓|OAS2,OAS3
+|In_Query|✓|OAS2,OAS3
+|In_Header|✓|OAS2,OAS3
+|In_Cookie|✓|OAS3
+|Style_Matrix|✗|OAS3
+|Style_Label|✗|OAS3
+|Style_Form|✗|OAS3
+|Style_Simple|✗|OAS3
+|Style_SpaceDelimited|✗|OAS3
+|Style_PipeDelimited|✗|OAS3
+|Style_DeepObject|✗|OAS3
+|Explode|✗|OAS3
+|Schema|✗|OAS3
+|Content|✗|OAS3
-### Schema Support Feature
+### Schema Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✗|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
+|AdditionalProperties|✗|OAS2,OAS3
+|AllOf|✗|OAS2,OAS3
+|AnyOf|✗|OAS3
+|Default|✗|OAS2,OAS3
+|Discriminator|✓|OAS2,OAS3
+|Enum|✓|OAS2,OAS3
+|ExclusiveMinimum|✓|OAS2,OAS3
+|ExclusiveMaximum|✓|OAS2,OAS3
+|Format|✓|OAS2,OAS3
+|Items|✓|OAS2,OAS3
+|MaxItems|✓|OAS2,OAS3
+|MaxLength|✓|OAS2,OAS3
+|MaxProperties|✓|OAS2,OAS3
+|Maximum|✓|OAS2,OAS3
+|MinItems|✓|OAS2,OAS3
+|MinLength|✓|OAS2,OAS3
+|MinProperties|✓|OAS2,OAS3
+|Minimum|✓|OAS2,OAS3
+|MultipleOf|✓|OAS2,OAS3
+|Not|✗|OAS3
+|Nullable|✗|OAS3
+|OneOf|✗|OAS3
+|Pattern|✓|OAS2,OAS3
+|Properties|✓|OAS2,OAS3
+|Required|✓|OAS2,OAS3
+|Type|✓|OAS2,OAS3
+|UniqueItems|✓|OAS2,OAS3
+|Xml|✗|OAS2,OAS3
### Security Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|BasicAuth|✗|OAS2,OAS3
+|HTTP_Basic|✗|OAS2,OAS3
|ApiKey|✗|OAS2,OAS3
|OpenIDConnect|✗|OAS3
-|BearerToken|✗|OAS3
+|HTTP_Bearer|✗|OAS2,OAS3
|OAuth2_Implicit|✗|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3
diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md
index 90ee80172ab..37838528eb6 100644
--- a/docs/generators/jmeter.md
+++ b/docs/generators/jmeter.md
@@ -22,17 +22,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true|
|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
|enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|
**false**
No changes to the enum's are made, this is the default option.
**true**
With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.
|false|
-|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|
**true**
The mapping in the discriminator includes descendant schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.
**false**
The mapping in the discriminator includes any descendant schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.
|true|
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-
-
## INSTANTIATION TYPES
| Type/Alias | Instantiated By |
@@ -62,15 +56,30 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|UserAgent|✗|ToolingExtension
|MockServer|✗|ToolingExtension
+### Components Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|schemas|✗|OAS3
+|responses|✗|OAS3
+|parameters|✗|OAS3
+|examples|✗|OAS3
+|requestBodies|✗|OAS3
+|headers|✗|OAS3
+|securitySchemes|✗|OAS3
+|links|✗|OAS3
+|callbacks|✗|OAS3
+|pathItems|✗|OAS3
+
### Data Type Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Custom|✗|OAS2,OAS3
|Int32|✓|OAS2,OAS3
|Int64|✓|OAS2,OAS3
+|Integer|✗|OAS2,OAS3
|Float|✓|OAS2,OAS3
|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
+|Number|✗|OAS2,OAS3
|String|✓|OAS2,OAS3
|Byte|✓|OAS2,OAS3
|Binary|✓|OAS2,OAS3
@@ -79,82 +88,109 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|DateTime|✓|OAS2,OAS3
|Password|✓|OAS2,OAS3
|File|✓|OAS2
-|Uuid|✗|
+|Uuid|✗|OAS2,OAS3
|Array|✓|OAS2,OAS3
|Null|✗|OAS3
|AnyType|✗|OAS2,OAS3
|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
### Documentation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Readme|✗|ToolingExtension
-|Model|✓|ToolingExtension
+|Servers|✗|OAS3
+|Security|✗|OAS2,OAS3
+|ComponentSchemas|✓|OAS3
+|ComponentResponses|✗|OAS3
+|ComponentParameters|✗|OAS3
+|ComponentRequestBodies|✗|OAS3
+|ComponentHeaders|✗|OAS3
+|ComponentSecuritySchemes|✗|OAS3
+|ComponentLinks|✗|OAS3
+|ComponentCallbacks|✗|OAS3
+|ComponentPathItems|✗|OAS3
|Api|✓|ToolingExtension
### Global Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✗|OAS3
-|LinkObjects|✗|OAS3
+|Servers|✗|OAS3
+|Paths|✗|OAS2,OAS3
+|Webhooks|✗|OAS3
+|Components|✓|OAS3
+|Security|✗|OAS2,OAS3
+|Tags|✗|OAS2,OAS3
+|ExternalDocs|✗|OAS2,OAS3
+
+### Operation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Responses_HttpStatusCode|✓|OAS3
+|Responses_RangedResponseCodes|✗|OAS3
+|Responses_Default|✓|OAS3
+|Responses_RedirectionResponse|✗|OAS3
### Parameter Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✓|OAS3
-
-### Schema Support Feature
+|Name|✗|OAS2,OAS3
+|Required|✗|OAS2,OAS3
+|In_Path|✓|OAS2,OAS3
+|In_Query|✓|OAS2,OAS3
+|In_Header|✓|OAS2,OAS3
+|In_Cookie|✓|OAS3
+|Style_Matrix|✗|OAS3
+|Style_Label|✗|OAS3
+|Style_Form|✗|OAS3
+|Style_Simple|✗|OAS3
+|Style_SpaceDelimited|✗|OAS3
+|Style_PipeDelimited|✗|OAS3
+|Style_DeepObject|✗|OAS3
+|Explode|✗|OAS3
+|Schema|✗|OAS3
+|Content|✗|OAS3
+
+### Schema Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✗|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
+|AdditionalProperties|✗|OAS2,OAS3
+|AllOf|✗|OAS2,OAS3
+|AnyOf|✗|OAS3
+|Default|✗|OAS2,OAS3
+|Discriminator|✓|OAS2,OAS3
+|Enum|✓|OAS2,OAS3
+|ExclusiveMinimum|✓|OAS2,OAS3
+|ExclusiveMaximum|✓|OAS2,OAS3
+|Format|✓|OAS2,OAS3
+|Items|✓|OAS2,OAS3
+|MaxItems|✓|OAS2,OAS3
+|MaxLength|✓|OAS2,OAS3
+|MaxProperties|✓|OAS2,OAS3
+|Maximum|✓|OAS2,OAS3
+|MinItems|✓|OAS2,OAS3
+|MinLength|✓|OAS2,OAS3
+|MinProperties|✓|OAS2,OAS3
+|Minimum|✓|OAS2,OAS3
+|MultipleOf|✓|OAS2,OAS3
+|Not|✗|OAS3
+|Nullable|✗|OAS3
+|OneOf|✗|OAS3
+|Pattern|✓|OAS2,OAS3
+|Properties|✓|OAS2,OAS3
+|Required|✓|OAS2,OAS3
+|Type|✓|OAS2,OAS3
+|UniqueItems|✓|OAS2,OAS3
+|Xml|✗|OAS2,OAS3
### Security Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|BasicAuth|✓|OAS2,OAS3
+|HTTP_Basic|✓|OAS2,OAS3
|ApiKey|✓|OAS2,OAS3
|OpenIDConnect|✗|OAS3
-|BearerToken|✗|OAS3
+|HTTP_Bearer|✗|OAS2,OAS3
|OAuth2_Implicit|✓|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3
diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md
index 9604691912b..d6f01c02453 100644
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -25,14 +25,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|dateLibrary|Option. Date library to use|
**threetenbp-localdatetime**
Threetenbp - Backport of JSR310 (jvm only, for legacy app only)
**string**
String
**java8-localdatetime**
Java 8 native JSR310 (jvm only, for legacy app only)
**java8**
Java 8 native JSR310 (jvm only, preferred for jdk 1.8+)
**threetenbp**
Threetenbp - Backport of JSR310 (jvm only, preferred for jdk < 1.8)
|java8|
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |camelCase|
|generateRoomModels|Generate Android Room database models in addition to API models (JVM Volley library only)| |false|
-|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
+|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapijsonschematools|
|idea|Add IntellJ Idea plugin and mark Kotlin main and test folders as source folders.| |false|
|library|Library template (sub-template) to use|
|jvm-okhttp4|
|modelMutable|Create mutable models| |false|
|moshiCodeGen|Whether to enable codegen with the Moshi library. Refer to the [official Moshi doc](https://github.com/square/moshi#codegen) for more info.| |false|
|omitGradlePluginVersions|Whether to declare Gradle plugin versions in build files.| |false|
|omitGradleWrapper|Whether to omit Gradle wrapper for creating a sub project.| |false|
-|packageName|Generated artifact package name.| |org.openapitools.client|
+|packageName|Generated artifact package name.| |org.openapijsonschematools.client|
|parcelizeModels|toggle "@Parcelize" for generated models| |null|
|requestDateConverter|JVM-Option. Defines in how to handle date-time objects that are used for a request (as query or parameter)|
**toJson**
[DEFAULT] Date formatter option using a json converter.
**toString**
Use the 'toString'-method of the date-time object to retrieve the related string representation.
|toJson|
|serializableModel|boolean - toggle "implements Serializable" for generated models| |null|
@@ -46,22 +46,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: this option has been deprecated. Please use `useRxJava3` instead.| |false|
|useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library.| |false|
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-|BigDecimal|java.math.BigDecimal|
-|Date|java.time.LocalDate|
-|DateTime|java.time.OffsetDateTime|
-|File|java.io.File|
-|LocalDate|java.time.LocalDate|
-|LocalDateTime|java.time.LocalDateTime|
-|LocalTime|java.time.LocalTime|
-|Timestamp|java.sql.Timestamp|
-|URI|java.net.URI|
-|UUID|java.util.UUID|
-
-
## INSTANTIATION TYPES
| Type/Alias | Instantiated By |
@@ -182,15 +166,30 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|UserAgent|✗|ToolingExtension
|MockServer|✗|ToolingExtension
+### Components Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|schemas|✗|OAS3
+|responses|✗|OAS3
+|parameters|✗|OAS3
+|examples|✗|OAS3
+|requestBodies|✗|OAS3
+|headers|✗|OAS3
+|securitySchemes|✗|OAS3
+|links|✗|OAS3
+|callbacks|✗|OAS3
+|pathItems|✗|OAS3
+
### Data Type Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Custom|✗|OAS2,OAS3
|Int32|✓|OAS2,OAS3
|Int64|✓|OAS2,OAS3
+|Integer|✗|OAS2,OAS3
|Float|✓|OAS2,OAS3
|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
+|Number|✗|OAS2,OAS3
|String|✓|OAS2,OAS3
|Byte|✓|OAS2,OAS3
|Binary|✓|OAS2,OAS3
@@ -199,82 +198,109 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|DateTime|✓|OAS2,OAS3
|Password|✓|OAS2,OAS3
|File|✓|OAS2
-|Uuid|✗|
+|Uuid|✗|OAS2,OAS3
|Array|✓|OAS2,OAS3
|Null|✗|OAS3
|AnyType|✗|OAS2,OAS3
|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
### Documentation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Readme|✓|ToolingExtension
-|Model|✓|ToolingExtension
+|Servers|✗|OAS3
+|Security|✗|OAS2,OAS3
+|ComponentSchemas|✓|OAS3
+|ComponentResponses|✗|OAS3
+|ComponentParameters|✗|OAS3
+|ComponentRequestBodies|✗|OAS3
+|ComponentHeaders|✗|OAS3
+|ComponentSecuritySchemes|✗|OAS3
+|ComponentLinks|✗|OAS3
+|ComponentCallbacks|✗|OAS3
+|ComponentPathItems|✗|OAS3
|Api|✓|ToolingExtension
### Global Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✗|OAS3
-|LinkObjects|✗|OAS3
+|Servers|✗|OAS3
+|Paths|✗|OAS2,OAS3
+|Webhooks|✗|OAS3
+|Components|✓|OAS3
+|Security|✗|OAS2,OAS3
+|Tags|✗|OAS2,OAS3
+|ExternalDocs|✗|OAS2,OAS3
+
+### Operation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Responses_HttpStatusCode|✓|OAS3
+|Responses_RangedResponseCodes|✗|OAS3
+|Responses_Default|✓|OAS3
+|Responses_RedirectionResponse|✗|OAS3
### Parameter Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✗|OAS3
+|Name|✗|OAS2,OAS3
+|Required|✗|OAS2,OAS3
+|In_Path|✓|OAS2,OAS3
+|In_Query|✓|OAS2,OAS3
+|In_Header|✓|OAS2,OAS3
+|In_Cookie|✗|OAS3
+|Style_Matrix|✗|OAS3
+|Style_Label|✗|OAS3
+|Style_Form|✗|OAS3
+|Style_Simple|✗|OAS3
+|Style_SpaceDelimited|✗|OAS3
+|Style_PipeDelimited|✗|OAS3
+|Style_DeepObject|✗|OAS3
+|Explode|✗|OAS3
+|Schema|✗|OAS3
+|Content|✗|OAS3
-### Schema Support Feature
+### Schema Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✗|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
+|AdditionalProperties|✗|OAS2,OAS3
+|AllOf|✗|OAS2,OAS3
+|AnyOf|✗|OAS3
+|Default|✗|OAS2,OAS3
+|Discriminator|✓|OAS2,OAS3
+|Enum|✓|OAS2,OAS3
+|ExclusiveMinimum|✓|OAS2,OAS3
+|ExclusiveMaximum|✓|OAS2,OAS3
+|Format|✓|OAS2,OAS3
+|Items|✓|OAS2,OAS3
+|MaxItems|✓|OAS2,OAS3
+|MaxLength|✓|OAS2,OAS3
+|MaxProperties|✓|OAS2,OAS3
+|Maximum|✓|OAS2,OAS3
+|MinItems|✓|OAS2,OAS3
+|MinLength|✓|OAS2,OAS3
+|MinProperties|✓|OAS2,OAS3
+|Minimum|✓|OAS2,OAS3
+|MultipleOf|✓|OAS2,OAS3
+|Not|✗|OAS3
+|Nullable|✗|OAS3
+|OneOf|✗|OAS3
+|Pattern|✓|OAS2,OAS3
+|Properties|✓|OAS2,OAS3
+|Required|✓|OAS2,OAS3
+|Type|✓|OAS2,OAS3
+|UniqueItems|✓|OAS2,OAS3
+|Xml|✗|OAS2,OAS3
### Security Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|BasicAuth|✓|OAS2,OAS3
+|HTTP_Basic|✓|OAS2,OAS3
|ApiKey|✓|OAS2,OAS3
|OpenIDConnect|✗|OAS3
-|BearerToken|✓|OAS3
+|HTTP_Bearer|✓|OAS2,OAS3
|OAuth2_Implicit|✗|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3
diff --git a/docs/generators/python.md b/docs/generators/python.md
index f3cb2163115..abd88895215 100644
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -28,20 +28,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|packageVersion|python package version.| |1.0.0|
|projectName|python project name in setup.py (e.g. petstore-api).| |null|
|recursionLimit|Set the recursion limit. If not set, use the system default value.| |null|
-|useInlineModelResolver|use the inline model resolver, if true inline complex models will be extracted into components and $refs to them will be used| |false|
|useNose|use the nose test framework| |false|
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-
-
## INSTANTIATION TYPES
| Type/Alias | Instantiated By |
| ---------- | --------------- |
-|map|dict|
+|array|tuple|
+|boolean|schemas.BoolClass|
+|integer|decimal.Decimal|
+|null|schemas.NoneClass|
+|number|decimal.Decimal|
+|object|frozendict.frozendict|
+|string|str|
## LANGUAGE PRIMITIVES
@@ -65,14 +64,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
## RESERVED WORDS
-
all_params
and
as
assert
async
-
auth_settings
await
-
body_params
bool
break
class
@@ -85,15 +81,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl
except
exec
false
-
file_type
finally
float
for
-
form_params
from
frozendict
global
-
header_params
if
import
in
@@ -101,19 +94,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
is
lambda
list
-
local_var_files
none
-
none_type
nonlocal
not
or
pass
-
path_params
print
property
-
query_params
raise
-
resource_path
return
self
str
@@ -136,100 +124,142 @@ These options may be applied as additional-properties (cli) or configOptions (pl
|UserAgent|✗|ToolingExtension
|MockServer|✗|ToolingExtension
+### Components Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|schemas|✓|OAS3
+|responses|✓|OAS3
+|parameters|✓|OAS3
+|examples|✗|OAS3
+|requestBodies|✓|OAS3
+|headers|✓|OAS3
+|securitySchemes|✓|OAS3
+|links|✗|OAS3
+|callbacks|✗|OAS3
+|pathItems|✗|OAS3
+
### Data Type Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Custom|✗|OAS2,OAS3
|Int32|✓|OAS2,OAS3
|Int64|✓|OAS2,OAS3
+|Integer|✓|OAS2,OAS3
|Float|✓|OAS2,OAS3
|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
+|Number|✓|OAS2,OAS3
|String|✓|OAS2,OAS3
-|Byte|✓|OAS2,OAS3
+|Byte|✗|OAS2,OAS3
|Binary|✓|OAS2,OAS3
|Boolean|✓|OAS2,OAS3
|Date|✓|OAS2,OAS3
|DateTime|✓|OAS2,OAS3
-|Password|✓|OAS2,OAS3
+|Password|✗|OAS2,OAS3
|File|✓|OAS2
-|Uuid|✓|
+|Uuid|✓|OAS2,OAS3
|Array|✓|OAS2,OAS3
|Null|✓|OAS3
|AnyType|✓|OAS2,OAS3
|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
### Documentation Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
|Readme|✓|ToolingExtension
-|Model|✓|ToolingExtension
+|Servers|✓|OAS3
+|Security|✓|OAS2,OAS3
+|ComponentSchemas|✓|OAS3
+|ComponentResponses|✓|OAS3
+|ComponentParameters|✓|OAS3
+|ComponentRequestBodies|✓|OAS3
+|ComponentHeaders|✓|OAS3
+|ComponentSecuritySchemes|✓|OAS3
+|ComponentLinks|✗|OAS3
+|ComponentCallbacks|✗|OAS3
+|ComponentPathItems|✗|OAS3
|Api|✓|ToolingExtension
### Global Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✓|OAS3
-|ParameterStyling|✓|OAS3
-|Callbacks|✗|OAS3
-|LinkObjects|✗|OAS3
+|Servers|✓|OAS3
+|Paths|✓|OAS2,OAS3
+|Webhooks|✗|OAS3
+|Components|✓|OAS3
+|Security|✓|OAS2,OAS3
+|Tags|✓|OAS2,OAS3
+|ExternalDocs|✗|OAS2,OAS3
+
+### Operation Feature
+| Name | Supported | Defined By |
+| ---- | --------- | ---------- |
+|Responses_HttpStatusCode|✓|OAS3
+|Responses_RangedResponseCodes|✓|OAS3
+|Responses_Default|✓|OAS3
+|Responses_RedirectionResponse|✓|OAS3
### Parameter Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✗|OAS3
-
-### Schema Support Feature
+|Name|✓|OAS2,OAS3
+|Required|✓|OAS2,OAS3
+|In_Path|✓|OAS2,OAS3
+|In_Query|✓|OAS2,OAS3
+|In_Header|✓|OAS2,OAS3
+|In_Cookie|✗|OAS3
+|Style_Matrix|✓|OAS3
+|Style_Label|✓|OAS3
+|Style_Form|✓|OAS3
+|Style_Simple|✓|OAS3
+|Style_SpaceDelimited|✓|OAS3
+|Style_PipeDelimited|✓|OAS3
+|Style_DeepObject|✗|OAS3
+|Explode|✓|OAS3
+|Schema|✓|OAS3
+|Content|✓|OAS3
+
+### Schema Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✓|OAS2,OAS3
-|Union|✓|OAS3
-|allOf|✓|OAS2,OAS3
-|anyOf|✓|OAS3
-|oneOf|✓|OAS3
-|not|✓|OAS3
+|AdditionalProperties|✓|OAS2,OAS3
+|AllOf|✓|OAS2,OAS3
+|AnyOf|✓|OAS3
+|Default|✓|OAS2,OAS3
+|Discriminator|✓|OAS2,OAS3
+|Enum|✓|OAS2,OAS3
+|ExclusiveMinimum|✓|OAS2,OAS3
+|ExclusiveMaximum|✓|OAS2,OAS3
+|Format|✓|OAS2,OAS3
+|Items|✓|OAS2,OAS3
+|MaxItems|✓|OAS2,OAS3
+|MaxLength|✓|OAS2,OAS3
+|MaxProperties|✓|OAS2,OAS3
+|Maximum|✓|OAS2,OAS3
+|MinItems|✓|OAS2,OAS3
+|MinLength|✓|OAS2,OAS3
+|MinProperties|✓|OAS2,OAS3
+|Minimum|✓|OAS2,OAS3
+|MultipleOf|✓|OAS2,OAS3
+|Not|✓|OAS3
+|Nullable|✓|OAS3
+|OneOf|✓|OAS3
+|Pattern|✓|OAS2,OAS3
+|Properties|✓|OAS2,OAS3
+|Required|✓|OAS2,OAS3
+|Type|✓|OAS2,OAS3
+|UniqueItems|✓|OAS2,OAS3
+|Xml|✗|OAS2,OAS3
### Security Feature
| Name | Supported | Defined By |
| ---- | --------- | ---------- |
-|BasicAuth|✓|OAS2,OAS3
+|HTTP_Basic|✓|OAS2,OAS3
|ApiKey|✓|OAS2,OAS3
|OpenIDConnect|✗|OAS3
-|BearerToken|✓|OAS3
-|OAuth2_Implicit|✓|OAS2,OAS3
+|HTTP_Bearer|✓|OAS2,OAS3
+|OAuth2_Implicit|✗|OAS2,OAS3
|OAuth2_Password|✗|OAS2,OAS3
|OAuth2_ClientCredentials|✗|OAS2,OAS3
|OAuth2_AuthorizationCode|✗|OAS2,OAS3
diff --git a/docs/global-properties.md b/docs/global-properties.md
index c2c0aab6478..543d9d2f986 100644
--- a/docs/global-properties.md
+++ b/docs/global-properties.md
@@ -13,7 +13,7 @@ title: Global Properties
| debugSupportingFiles | Dumps JSON formatted Supporting File information during generation | none |
| verbose | Defines the verbosity | `true` or `false` |
| generateAliasAsModel | Defines whether primitive types defined at the model/schema level will be wrapped in a model | `true` or `false` |
-| org.openapitools.codegen.utils.oncelogger.enabled | Enable/disable the "OnceLogger" which reduces noise for select repeated logs | `true` or `false` |
+| org.openapijsonschematools.codegen.utils.oncelogger.enabled | Enable/disable the "OnceLogger" which reduces noise for select repeated logs | `true` or `false` |
| supportingFiles | Allows the user to define which supporting files will be generated. Prefer using the more robust `.openapi-generator-ignore`. | no value, or a comma-separated string of file names |
| models | Allows the user to define which models will be generated. Prefer using the more robust `.openapi-generator-ignore`. | no value, or a comma-separated string of model names |
| apis | Allows the user to define which apis will be generated. Prefer using the more robust `.openapi-generator-ignore`. | no value, or a comma-separated string of api names |
diff --git a/docs/installation.md b/docs/installation.md
index cd30e07eb75..7a2188dbd91 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -12,11 +12,11 @@ Some of the following are cross-platform options and some are not, these are cal
> **Platform(s)**: Linux, macOS, Windows
-The [npm package wrapper](https://github.com/openapitools/openapi-generator-cli) is cross-platform wrapper around the .jar artifact. It works by providing a CLI wrapper atop the JAR's command line options. This gives a simple interface layer which normalizes usage of the command line across operating systems, removing some differences in how options or switches are passed to the tool (depending on OS).
+The [npm package wrapper](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator-cli) is cross-platform wrapper around the .jar artifact. It works by providing a CLI wrapper atop the JAR's command line options. This gives a simple interface layer which normalizes usage of the command line across operating systems, removing some differences in how options or switches are passed to the tool (depending on OS).
**Install** the latest version of the tool globally, exposing the CLI on the command line:
```bash
-npm install @openapitools/openapi-generator-cli -g
+npm install @openapi-json-schema-tools/openapi-json-schema-generator-cli -g
```
To install a specific version of the tool, pass the version during installation:
@@ -28,12 +28,12 @@ openapi-generator-cli version-manager set 5.3.0
To install the tool as a dev dependency in your current project:
```bash
-npm install @openapitools/openapi-generator-cli -D
+npm install @openapi-json-schema-tools/openapi-json-schema-generator-cli -D
```
-Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc:
+Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc:
```bash
-npx @openapitools/openapi-generator-cli generate -i petstore.yaml -g ruby -o /tmp/test/
+npx @openapi-json-schema-tools/openapi-json-schema-generator-cli generate -i petstore.yaml -g ruby -o /tmp/test/
```
> `npx` will execute a globally available `openapi-generator`, and if not found it will fall back to project-local commands. The result is that the above command will work regardless of which installation method you've chosen.
@@ -48,7 +48,7 @@ npx @openapitools/openapi-generator-cli generate -i petstore.yaml -g ruby -o /tm
brew install openapi-generator
```
-Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc:
+Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc:
```bash
openapi-generator generate -i petstore.yaml -g ruby -o /tmp/test/
@@ -71,7 +71,7 @@ scoop bucket add java
scoop install openjdk
```
-Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc:
+Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc:
```
openapi-generator-cli generate -i petstore.yaml -g ruby
@@ -83,14 +83,14 @@ openapi-generator-cli generate -i petstore.yaml -g ruby
The OpenAPI Generator Docker image acts as a standalone executable. It can be used as an alternative to installing via homebrew, or for developers who are unable to install Java or upgrade the installed version.
-To generate code from a valid [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc with this image, you'll need to mount a local location as a volume.
+To generate code from a valid [petstore.yaml](https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml) doc with this image, you'll need to mount a local location as a volume.
You'll then need to output the generated code to this mapped volume. Everything else works the same as if you ran the command on your host machine.
Here's an example generating a Go client:
```bash
docker run --rm \
- -v ${PWD}:/local openapitools/openapi-generator-cli generate \
+ -v ${PWD}:/local openapi-json-schema-tools/openapi-json-schema-generator-cli generate \
-i /local/petstore.yaml \
-g go \
-o /local/out/go
@@ -103,18 +103,18 @@ docker run --rm \
If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.1.0/openapi-generator-cli-6.1.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapi-json-schema-tools/openapi-json-schema-generator-cli/6.1.0/openapi-generator-cli-6.1.0.jar`
For **Mac/Linux** users:
```bash
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.1.0/openapi-generator-cli-6.1.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapi-json-schema-tools/openapi-json-schema-generator-cli/6.1.0/openapi-generator-cli-6.1.0.jar -O openapi-generator-cli.jar
```
For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
```powershell
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.1.0/openapi-generator-cli-6.1.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapi-json-schema-tools/openapi-json-schema-generator-cli/6.1.0/openapi-generator-cli-6.1.0.jar
```
@@ -138,10 +138,10 @@ To install the launcher script, copy the contents of the script to a location on
An example of setting this up (NOTE: Always evaluate scripts curled from external systems before executing them).
```bash
-mkdir -p ~/bin/openapitools
-curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapitools/openapi-generator-cli
-chmod u+x ~/bin/openapitools/openapi-generator-cli
-export PATH=$PATH:~/bin/openapitools/
+mkdir -p ~/bin/openapijsonschematools
+curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapi-json-schema-tools/openapi-json-schema-generator-cli
+chmod u+x ~/bin/openapi-json-schema-tools/openapi-json-schema-generator-cli
+export PATH=$PATH:~/bin/openapijsonschematools/
```
Now, `openapi-generator-cli` is "installed". On invocation, it will query the GitHub repository for the most recently released version. If this matches the last downloaded jar,
diff --git a/docs/integration.md b/docs/integration.md
index e96b62321cf..a00c2856a96 100644
--- a/docs/integration.md
+++ b/docs/integration.md
@@ -55,4 +55,4 @@ cd /var/tmp/perl/petstore
Some generators also generate CI/CD configuration files (.travis.yml) so that the output will be ready to be tested by the CI (e.g. Travis)
-If you're looking for the configuration files of a particular CI that is not yet supported, please open an [issue](https://github.com/openapitools/openapi-generator/issues/new) to let us know.
+If you're looking for the configuration files of a particular CI that is not yet supported, please open an [issue](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues/new) to let us know.
diff --git a/docs/migration-from-swagger-codegen.md b/docs/migration-from-swagger-codegen.md
index 85232ebb91b..748f88e90eb 100644
--- a/docs/migration-from-swagger-codegen.md
+++ b/docs/migration-from-swagger-codegen.md
@@ -26,7 +26,7 @@ This guide explains the major differences in order to help you with the migratio
## New docker images
-The docker images are available on DockerHub: https://hub.docker.com/u/openapitools/
+The docker images are available on DockerHub: https://hub.docker.com/u/openapijsonschematools/
**CLI for OpenAPI Generator**
@@ -34,15 +34,7 @@ Image to run OpenAPI Generator in the command line (see [OpenAPI Generator CLI D
Old: `swaggerapi/swagger-codegen-cli`
-New: `openapitools/openapi-generator-cli`
-
-**OpenAPI Generator as web service**
-
-Image to run OpenAPI Generator as a web service (see [OpenAPI Generator Online Docker Image](https://github.com/OpenAPITools/openapi-generator/blob/master/README.md#openapi-generator-online-docker-image))
-
-Old: `swaggerapi/swagger-generator`
-
-New: `openapitools/openapi-generator-online`
+New: `openapi-json-schema-tools/openapi-json-schema-generator-cli`
## New maven coordinates
@@ -64,7 +56,7 @@ New:
```xml
- org.openapitools
+ org.openapijsonschematoolsopenapi-generator
```
@@ -82,7 +74,7 @@ New:
```xml
- org.openapitools
+ org.openapijsonschematoolsopenapi-generator-cli
```
@@ -100,7 +92,7 @@ New:
```xml
- org.openapitools
+ org.openapijsonschematoolsopenapi-generator-maven-plugin
```
@@ -173,17 +165,17 @@ The metadata folder (to store the `VERSION` file for example) is now called `.op
If you use a generator without specifying each parameter, you might see some differences in the generated code.
As example the default package name used in the generated code has changed.
-You need to have a look at the specific value, depending of your target language, but often `Swagger` îs replaced by `OpenAPITools` and `io.swagger` is replaced by `org.openapitools`.
-Concretely if you did not specify anything when you are generating java code, a file `org/openapitools/api/PetApi.java` might be generated instead of `io/swagger/api/PetApi.java`.
+You need to have a look at the specific value, depending of your target language, but often `Swagger` îs replaced by `OpenAPITools` and `io.swagger` is replaced by `org.openapijsonschematools`.
+Concretely if you did not specify anything when you are generating java code, a file `org/openapijsonschematools/api/PetApi.java` might be generated instead of `io/swagger/api/PetApi.java`.
If this is a problem for you, you need to explicitly set the the parameter value in order to match with the `swagger-codgen` default value (`apiPackage` == `io.swagger` in the previous example with the java generator).
## New fully qualified name for the classes
-If you have extended some generators in your project, and you are looking for a specific class, replace the `io.swagger.codegen` package (old name) with `org.openapitools.codegen` package (new name).
+If you have extended some generators in your project, and you are looking for a specific class, replace the `io.swagger.codegen` package (old name) with `org.openapijsonschematools.codegen` package (new name).
-Example: `org.openapitools.codegen.DefaultGenerator`
+Example: `DefaultGenerator`
## Body parameter name
diff --git a/docs/migration-guide.adoc b/docs/migration-guide.adoc
index 91c5b074bb1..26f88c3fa2d 100644
--- a/docs/migration-guide.adoc
+++ b/docs/migration-guide.adoc
@@ -59,7 +59,7 @@ If you want to switch back to the `3.1.x` behavior you can use:
==== Model (all languages)
-In `CodegenModel` and in `CodegenOperation` we use now our own class `org.openapitools.codegen.CodegenDiscriminator` instead of `io.swagger.v3.oas.models.media.Discriminator`.
+In `CodegenModel` and in `CodegenOperation` we use now our own class `CodegenDiscriminator` instead of `io.swagger.v3.oas.models.media.Discriminator`.
For the templates, this is not an API change, because the same values are available.
diff --git a/docs/new-generator.md b/docs/new-generator.md
index ad1f77039d4..a4ab8c3016c 100644
--- a/docs/new-generator.md
+++ b/docs/new-generator.md
@@ -10,13 +10,13 @@ Creating a new generator which will become a part of the officially supported ge
The minimum set of files required to create a new generator are:
* A "Codegen" file
- - exists under `modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/`
+ - exists under `modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/`
- defines language options
- defines framework options
- determines OpenAPI feature set
- extends the generation workflow
* SPI registration
- - Above class must be referenced in `modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig`
+ - Above class must be referenced in `modules/openapi-generator/src/main/resources/META-INF/services/CodegenConfig`
- Tells the generator that this class exists
- Allows for classpath extension (addition) of generators
* A minimal template
@@ -53,7 +53,7 @@ Examples:
./new.sh -n kotlin -s
Creates:
- modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
+ modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinServerCodegen.java
modules/openapi-generator/src/main/resources/kotlin-server/README.mustache
modules/openapi-generator/src/main/resources/kotlin-server/model.mustache
modules/openapi-generator/src/main/resources/kotlin-server/api.mustache
@@ -62,15 +62,15 @@ Examples:
Create a generic C# server generator:
./new.sh -n csharp -s -t
Creates:
- modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CsharpServerCodegen.java
+ modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/CsharpServerCodegen.java
modules/openapi-generator/src/main/resources/csharp-server/README.mustache
modules/openapi-generator/src/main/resources/csharp-server/model.mustache
modules/openapi-generator/src/main/resources/csharp-server/api.mustache
bin/configs/csharp-server-petstore-new.yaml
- modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CsharpServerCodegenTest.java
- modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CsharpServerCodegenModelTest.java
- modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CsharpServerCodegenOptionsTest.java
- modules/openapi-generator/src/test/java/org/openapitools/codegen/options/CsharpServerCodegenOptionsProvider.java
+ modules/openapi-generator/src/test/java/org/openapijsonschematools/codegen/csharp/CsharpServerCodegenTest.java
+ modules/openapi-generator/src/test/java/org/openapijsonschematools/codegen/csharp/CsharpServerCodegenModelTest.java
+ modules/openapi-generator/src/test/java/org/openapijsonschematools/codegen/csharp/CsharpServerCodegenOptionsTest.java
+ modules/openapi-generator/src/test/java/org/openapijsonschematools/codegen/options/CsharpServerCodegenOptionsProvider.java
```
This script allows us to define a client, server, schema, or documentation generator. We'll focus on the simplest generator (documentation). The other generator types may require heavy extension of the "Config" base class, and these docs could very quickly become outdated. When creating a new generator, please review existing generators as a guideline for implementation.
@@ -84,7 +84,7 @@ Create a new Markdown generator, specifying CommonMark as the name to avoid conf
You should see output similar to the following:
```bash
-Creating modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CommonMarkDocumentationCodegen.java
+Creating modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/CommonMarkDocumentationCodegen.java
Creating modules/openapi-generator/src/main/resources/common-mark-documentation/README.mustache
Creating modules/openapi-generator/src/main/resources/common-mark-documentation/model.mustache
Creating modules/openapi-generator/src/main/resources/common-mark-documentation/api.mustache
@@ -309,10 +309,10 @@ Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
{{#parent}}
{{#parentVars}}
-**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/parentVars}}
{{/parent}}
-{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{refClass}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/docs/online.md b/docs/online.md
deleted file mode 100644
index 3c86b1acd14..00000000000
--- a/docs/online.md
+++ /dev/null
@@ -1,142 +0,0 @@
----
-id: online
-title: Online
----
-
-## Hosted
-
-We offer online services, publicly and free of charge:
-
-- latest stable version: http://api.openapi-generator.tech
-- latest master: http://api-latest-master.openapi-generator.tech (updated with latest master every hour)
-
-> **Hosting Sponsor**
-> [](https://www.linode.com/)
-
-These services are beta and do not have any guarantee on service level
-
-## Docker Image
-
-The openapi-generator-online Docker image can act as a self-hosted web application and API for generating code. This container can be incorporated into a CI pipeline, and requires at least two HTTP requests and some docker orchestration to access generated code.
-
-Example usage:
-
-```bash
-# Start container at port 8888 and save the container id
-CID=$(docker run -d -p 8888:8080 openapitools/openapi-generator-online)
-
-# allow for startup
-sleep 10
-
-# Get the IP of the running container (optional)
-GEN_IP=$(docker inspect --format '{{.NetworkSettings.IPAddress}}' ${CID})
-
-# Execute an HTTP request to generate a Ruby client
-curl -X POST --header 'Content-Type: application/json' \
- --header 'Accept: application/json' \
- -d '{"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
- 'http://localhost:8888/api/gen/clients/ruby'
-
-# Example output:
-# {"code":"c2d483.3.4672-40e9-91df-b9ffd18d22b8","link":"http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8"}
-
-# Download the generated zip file (using "code" provided from your output)
-wget http://localhost:8888/api/gen/download/c2d483.3.4672-40e9-91df-b9ffd18d22b8
-
-# Unzip the file
-unzip c2d483.3.4672-40e9-91df-b9ffd18d22b8
-
-# Shutdown the openapi generator image
-docker stop ${CID} && docker rm ${CID}
-```
-
-## Local/Self-hosting
-
-If you prefer to run the service locally, here are the steps:
-
-```bash
-mvn clean install
-cd modules/openapi-generator-online
-mvn spring-boot:run
-```
-
-> The online openapi-generator can be run via [Docker](#docker-image) as well.
-
-For example, to generate Ruby API client, simply send the following HTTP request using curl:
-
-```bash
-curl -X POST -H "content-type:application/json" -d '{"openAPIUrl":"https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
- http://localhost:8080/api/gen/clients/ruby
-```
-Then you will receive a JSON response with the URL to download the zipped code.
-
-To customize the SDK, you can `POST` to `http://localhost:8080/gen/clients/{generator}` with the following HTTP body:
-
-```json
-{
- "options": {},
- "openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
-}
-```
-
-Here, the `options` for a language can be obtained by submitting a `GET` request to `http://locahost:8080/api/gen/clients/{generator}`:
-
-For example, `curl http://localhost:8080/api/gen/clients/python` returns
-
-```json
- "packageName":{
- "opt":"packageName",
- "description":"python package name (convention: snake_case).",
- "type":"string",
- "default":"openapi_client"
- },
- "packageVersion":{
- "opt":"packageVersion",
- "description":"python package version.",
- "type":"string",
- "default":"1.0.0"
- },
- "sortParamsByRequiredFlag":{
- "opt":"sortParamsByRequiredFlag",
- "description":"Sort method arguments to place required parameters before optional parameters.",
- "type":"boolean",
- "default":"true"
- }
-
-{}
-```
-
-To set package name to `pet_store`, the HTTP body of the request is as follows:
-
-```json
-{
- "options": {
- "packageName": "pet_store"
- },
- "openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
-}
-```
-
-and here is the curl command:
-```bash
-curl -H "Content-type: application/json" \
- -X POST \
- -d '{"options": {"packageName": "pet_store"},"openAPIUrl": "https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml"}' \
- http://localhost:8080/api/gen/clients/python
-```
-
-Instead of using `openAPIUrl` with an URL to the OpenAPI spec, one can include the spec in the JSON payload with `spec`:
-
-```json
-{
- "options": {},
- "spec": {
- "swagger": "2.0",
- "info": {
- "version": "1.0.0",
- "title": "Test API"
- },
- ...
- }
-}
-```
diff --git a/docs/plugins.md b/docs/plugins.md
index f4586135cdb..e9acacb50f0 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -13,7 +13,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
```xml
- org.openapitools
+ org.openapijsonschematoolsopenapi-generator-maven-plugin6.0.0
@@ -78,7 +78,7 @@ buildscript {
maven { url "https://repo1.maven.org/maven2" }
}
dependencies {
- classpath "org.openapitools:openapi-generator-gradle-plugin:5.0.0"
+ classpath "org.openapijsonschematools:openapi-generator-gradle-plugin:5.0.0"
}
}
diff --git a/docs/templating.md b/docs/templating.md
index d1bdd81a738..e0f9d8c5bfd 100644
--- a/docs/templating.md
+++ b/docs/templating.md
@@ -7,11 +7,11 @@ It's easy to work with templates for codegen!
For maybe 90% of use cases, you will only need to modify the mustache template files to create your own custom generated code. If you need to include additional files in your generated output, manipulate the OpenAPI document inputs, or implement your own vendor extensions or other logic, you'll want to read [customization](./customization.md) after you read this document. Be sure to start here first, because templating is the easier concept and you'll need it for more advanced use cases.
-The generator workflow has [transforming logic](https://github.com/openapitools/openapi-generator/tree/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages) as well as templates for each generation of code.
+The generator workflow has [transforming logic](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages) as well as templates for each generation of code.
-Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates. While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [ScalaFinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaFinchServerCodegen.java) for an advanced example).
+Each generator will create a data structure from the OpenAPI document; OpenAPI 2.0 and OpenAPI 3.x documents are normalized into the same API model within the generator. This model is then applied to the templates. While generators do not need to perform transformations, it's often necessary in order to add more advanced support for your language or framework. You may need to refer to the generator implementation to understand some of the logic while creating or customizing templates (see [ScalaFinchServerCodegen.java](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/languages/ScalaFinchServerCodegen.java) for an advanced example).
-The transform logic needs to implement [CodegenConfig.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java) and is most easily done by extending [DefaultCodegen.java](https://github.com/openapitools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java). Take a look at the various implementations as a guideline while the instructions get more complete.
+The transform logic needs to implement [CodegenConfig.java](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfig.java) and is most easily done by extending [DefaultCodegen.java](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java). Take a look at the various implementations as a guideline while the instructions get more complete.
## Modifying Templates
@@ -39,11 +39,11 @@ OpenAPI Generator not only supports local files for templating, but also templat
│ └── style.css.mustache
```
-You can define your classpath to contain your JAR and the openapi-generator-cli _fat jar_, then invoke main class `org.openapitools.codegen.OpenAPIGenerator`. For instance,
+You can define your classpath to contain your JAR and the openapi-generator-cli _fat jar_, then invoke main class `OpenAPIGenerator`. For instance,
```bash
java -cp /path/totemplate-classpath-example-1.0-SNAPSHOT.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar \
- org.openapitools.codegen.OpenAPIGenerator generate \
+ OpenAPIGenerator generate \
-i https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/petstore.yaml \
-g html -o template-example -t templates/htmlDocs
```
@@ -247,7 +247,7 @@ Now we're ready to generate the client with our simple changes. When we pass the
openapi-generator generate -g java --library resteasy \
-t ~/.openapi-generator/templates/Java \
-o ~/.openapi-generator/example \
- -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+ -i https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml
```
Make sure your custom template compiles:
@@ -302,7 +302,7 @@ appender.rolling.policies.size.size=100MB
appender.rolling.strategy.type = DefaultRolloverStrategy
appender.rolling.strategy.max = 5
-logger.rolling.name = org.openapitools.client.api.PetApi
+logger.rolling.name = org.openapijsonschematools.client.api.PetApi
logger.rolling.level = debug
logger.rolling.additivity = false
logger.rolling.appenderRef.rolling.ref = RollingFile
@@ -330,7 +330,7 @@ This example:
* requires Gradle 5.0+
* provides project setup instructions for IntelliJ
-To begin, create a [new Gradle project](https://www.jetbrains.com/help/idea/getting-started-with-gradle.html) with Kotlin support. To do this, go to `File` ➞ `New` ➞ `Project`, choose "Gradle" and "Kotlin". Specify groupId `org.openapitools.examples` and artifactId `pebble-template-adapter`.
+To begin, create a [new Gradle project](https://www.jetbrains.com/help/idea/getting-started-with-gradle.html) with Kotlin support. To do this, go to `File` ➞ `New` ➞ `Project`, choose "Gradle" and "Kotlin". Specify groupId `org.openapijsonschematools.examples` and artifactId `pebble-template-adapter`.
Ensure the new project uses Gradle 5.0. Navigate to the newly created directory and execute:
@@ -350,7 +350,7 @@ Modifications to the new project's `build.gradle` should be made in the `plugins
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
- compile "org.openapitools:openapi-generator-core:4.0.0-SNAPSHOT"
+ compile "org.openapijsonschematools:openapi-generator-core:4.0.0-SNAPSHOT"
compile "io.pebbletemplates:pebble:3.0.8"
}
```
@@ -363,9 +363,9 @@ The class in its simplest form looks like this (with inline comments):
```kotlin
// Allows specifying engine by class name
-// e.g. -e org.openapitools.examples.templating.PebbleTemplateAdapter
+// e.g. -e org.openapijsonschematools.examples.templating.PebbleTemplateAdapter
@file:JvmName("PebbleTemplateAdapter")
-package org.openapitools.examples.templating
+package org.openapijsonschematools.examples.templating
// imports
@@ -402,10 +402,10 @@ class PebbleTemplateAdapter : AbstractTemplatingEngineAdapter() {
}
```
-Lastly, create a file `resources/META-INF/services/org.openapitools.codegen.api.TemplatingEngineAdapter`, containing the full class path to the above class:
+Lastly, create a file `resources/META-INF/services/TemplatingEngineAdapter`, containing the full class path to the above class:
```
-org.openapitools.examples.templating.PebbleTemplateAdapter
+org.openapijsonschematools.examples.templating.PebbleTemplateAdapter
```
This allows the adapter to load via ServiceLoader, and to be referenced via the identifier `pebble`. This is optional; if you don't provide the above file and contents, you'll only be able to load the engine via full class name (explained in a bit).
@@ -462,7 +462,7 @@ Finally, we can compile some code by explicitly defining our classpath and jar e
```bash
java $JAVA_OPTS -cp /your/path/build/libs/pebble-template-adapter-1.0-SNAPSHOT-all.jar:modules/openapi-generator-cli/target/openapi-generator-cli.jar \
- org.openapitools.codegen.OpenAPIGenerator \
+ OpenAPIGenerator \
generate \
-g go \
-i https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v2.0/json/petstore-minimal.json \
@@ -474,7 +474,7 @@ java $JAVA_OPTS -cp /your/path/build/libs/pebble-template-adapter-1.0-SNAPSHOT-a
**NOTE** Running your custom generator requires adding it to the classpath. This differs on [Windows](https://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html) slightly from [unix](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/classpath.html).
-In the above example, we've targeted our custom template engine adapter via `-e pebble`. If you don't include the SPI file under `META-INF/services`, you'll need to specify the exact classpath: `org.openapitools.examples.templating.PebbleTemplateAdapter`. Notice that the target class here matches the Kotlin class name. This is because of the `@file:JvmName` annotation.
+In the above example, we've targeted our custom template engine adapter via `-e pebble`. If you don't include the SPI file under `META-INF/services`, you'll need to specify the exact classpath: `org.openapijsonschematools.examples.templating.PebbleTemplateAdapter`. Notice that the target class here matches the Kotlin class name. This is because of the `@file:JvmName` annotation.
Congratulations on creating a custom templating engine adapter!
@@ -807,7 +807,7 @@ Supporting files can either be processed through the templating engine or copied
> This is a very limited list of variable name explanations. Feel free to [open a pull request](https://github.com/OpenAPITools/openapi-generator/pull/new/master) to add to this documentation!
-- **complexType**: stores the name of the model (e.g. Pet)
+- **refClass**: stores the name of the model (e.g. Pet)
- **isContainer**: true if the parameter or property is an array or a map.
- **isPrimitiveType**: true if the parameter or property type is a primitive type (e.g. string, integer, etc) as defined in the spec.
diff --git a/docs/usage.md b/docs/usage.md
index d6a976fa30a..dc5b649b414 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -206,7 +206,7 @@ OPTIONS
-p , --package
the package to put the main class into (defaults to
- org.openapitools.codegen)
+ org.openapijsonschematools.codegen)
-t , --type
the type of generator that is created
@@ -384,7 +384,7 @@ OPTIONS
Git repo ID, e.g. openapi-generator.
--git-user-id
- Git user ID, e.g. openapitools.
+ Git user ID, e.g. openapijsonschematools.
--global-property
sets specified global properties (previously called 'system
@@ -520,7 +520,7 @@ At a minimum, `generate` requires:
### Examples
-The following examples use [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml).
+The following examples use [petstore.yaml](https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml).
#### Additional Properties
@@ -560,7 +560,7 @@ openapi-generator-cli generate \
--type-mappings=DateTime=java.time.LocalDateTime
```
-> NOTE: mappings are applied to `DateTime`, as this is the representation of the primitive type. See [DefaultCodegen](https://github.com/OpenAPITools/openapi-generator/blob/7cee999543fcc00b7c1eb9f70f0456b707c7f9e2/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java#L1431).
+> NOTE: mappings are applied to `DateTime`, as this is the representation of the primitive type. See [DefaultCodegen](https://github.com/OpenAPITools/openapi-generator/blob/7cee999543fcc00b7c1eb9f70f0456b707c7f9e2/modules/openapi-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java#L1431).
#### File Post-Processing
diff --git a/modules/openapi-json-schema-generator-cli/pom.xml b/modules/openapi-json-schema-generator-cli/pom.xml
index 586c505c6ac..d47a802d896 100644
--- a/modules/openapi-json-schema-generator-cli/pom.xml
+++ b/modules/openapi-json-schema-generator-cli/pom.xml
@@ -1,7 +1,7 @@
- org.openapitools
+ org.openapijsonschematoolsopenapi-json-schema-generator-project${revision}../..
@@ -38,7 +38,7 @@
- org.openapitools.codegen.OpenAPIGenerator
+ org.openapijsonschematools.codegen.OpenAPIGenerator
@@ -109,7 +109,7 @@
- org.openapitools
+ org.openapijsonschematoolsopenapi-json-schema-generator${project.version}
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/Constants.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/Constants.java
new file mode 100644
index 00000000000..0049af363bb
--- /dev/null
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/Constants.java
@@ -0,0 +1,9 @@
+package org.openapijsonschematools.codegen;
+
+public class Constants {
+ private Constants(){ }
+
+ public static final String CLI_NAME = "openapi-generator-cli";
+ public static final String GIT_REPO = "https://github.com/openapi-json-schema-tools/openapi-json-schema-generator";
+ public static final String SITE = "https://openapi-generator.tech/";
+}
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java
similarity index 76%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java
index 335b1232de6..d40877ce816 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java
@@ -15,33 +15,42 @@
* limitations under the License.
*/
-package org.openapitools.codegen;
+package org.openapijsonschematools.codegen;
import io.airlift.airline.Cli;
import io.airlift.airline.ParseArgumentsUnexpectedException;
import io.airlift.airline.ParseOptionMissingException;
import io.airlift.airline.ParseOptionMissingValueException;
-import org.openapitools.codegen.cmd.*;
+import org.openapijsonschematools.codegen.cmd.AuthorTemplate;
+import org.openapijsonschematools.codegen.cmd.BuildInfo;
+import org.openapijsonschematools.codegen.cmd.CompletionCommand;
+import org.openapijsonschematools.codegen.cmd.ConfigHelp;
+import org.openapijsonschematools.codegen.cmd.Generate;
+import org.openapijsonschematools.codegen.cmd.GenerateBatch;
+import org.openapijsonschematools.codegen.cmd.HelpCommand;
+import org.openapijsonschematools.codegen.cmd.ListGenerators;
+import org.openapijsonschematools.codegen.cmd.Meta;
+import org.openapijsonschematools.codegen.cmd.OpenApiGeneratorCommand;
+import org.openapijsonschematools.codegen.cmd.Validate;
+import org.openapijsonschematools.codegen.cmd.Version;
import java.util.Locale;
-import static org.openapitools.codegen.Constants.CLI_NAME;
-
/**
* User: lanwen Date: 24.03.15 Time: 17:56
*
- * Command line interface for OpenAPI Generator use `openapi-generator-cli.jar help` for more info
+ * Command line interface for OpenAPI JSON Schema Generator use `openapi-generator-cli.jar help` for more info
*/
public class OpenAPIGenerator {
public static void main(String[] args) {
BuildInfo buildInfo = new BuildInfo();
Cli.CliBuilder builder =
- Cli.builder(CLI_NAME)
+ Cli.builder(Constants.CLI_NAME)
.withDescription(
String.format(
Locale.ROOT,
- "OpenAPI Generator CLI %s (%s).",
+ "OpenAPI JSON Schema Generator CLI %s (%s).",
buildInfo.getVersion(),
buildInfo.getSha()))
.withDefaultCommand(HelpCommand.class)
@@ -76,7 +85,7 @@ public static void main(String[] args) {
System.exit(1);
}
} catch (ParseArgumentsUnexpectedException e) {
- System.err.printf(Locale.ROOT, "[error] %s%n%nSee '%s help' for usage.%n", e.getMessage(), CLI_NAME);
+ System.err.printf(Locale.ROOT, "[error] %s%n%nSee '%s help' for usage.%n", e.getMessage(), Constants.CLI_NAME);
System.exit(1);
} catch (ParseOptionMissingException | ParseOptionMissingValueException e) {
System.err.printf(Locale.ROOT, "[error] %s%n", e.getMessage());
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java
similarity index 96%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java
index da02a602463..1c496f1ddd0 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/AuthorTemplate.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java
@@ -1,11 +1,11 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Command;
import io.airlift.airline.Option;
import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenConfigLoader;
-import org.openapitools.codegen.CodegenConstants;
+import org.openapijsonschematools.codegen.CodegenConfig;
+import org.openapijsonschematools.codegen.CodegenConfigLoader;
+import org.openapijsonschematools.codegen.CodegenConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/BuildInfo.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java
similarity index 96%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/BuildInfo.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java
index 4058d1208ec..c47581b81bd 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/BuildInfo.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import java.io.IOException;
import java.io.InputStream;
@@ -9,7 +9,7 @@
import java.util.Locale;
import java.util.Properties;
-import static org.openapitools.codegen.Constants.*;
+import static org.openapijsonschematools.codegen.Constants.*;
/**
* Presents build-time information
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/CompletionCommand.java
similarity index 98%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/CompletionCommand.java
index bd67596fa9b..08663e7fda8 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/CompletionCommand.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/CompletionCommand.java
@@ -19,7 +19,7 @@
* https://github.com/airlift/airline/blob/fc7a55e34b6361cb97235de5a1b21cba9b508f4b/src/main/java/io/airlift/airline/SuggestCommand.java#L1
* Modifications have been made to fit the needs of OpenAPI Tools CLI.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java
similarity index 92%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java
index 63064146c23..e81eb6e9274 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/ConfigHelp.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Command;
import io.airlift.airline.Option;
import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenConfigLoader;
-import org.openapitools.codegen.GeneratorNotFoundException;
-import org.openapitools.codegen.VendorExtension;
-import org.openapitools.codegen.meta.FeatureSet;
+import org.openapijsonschematools.codegen.CliOption;
+import org.openapijsonschematools.codegen.CodegenConfig;
+import org.openapijsonschematools.codegen.CodegenConfigLoader;
+import org.openapijsonschematools.codegen.GeneratorNotFoundException;
+import org.openapijsonschematools.codegen.VendorExtension;
+import org.openapijsonschematools.codegen.meta.FeatureSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,9 +68,6 @@ public class ConfigHelp extends OpenApiGeneratorCommand {
FORMAT_TEXT, FORMAT_MARKDOWN, FORMAT_YAMLSAMPLE})
private String format;
- @Option(name = {"--import-mappings"}, title = "import mappings", description = "displays the default import mappings (types and aliases, and what imports they will pull into the template)")
- private Boolean importMappings;
-
@Option(name = {"--schema-mappings"}, title = "schema mappings", description = "display the schema mappings (none)")
private Boolean schemaMappings;
@@ -119,7 +116,6 @@ public void execute() {
instantiationTypes = Boolean.TRUE;
reservedWords = Boolean.TRUE;
languageSpecificPrimitives = Boolean.TRUE;
- importMappings = Boolean.TRUE;
featureSets = Boolean.TRUE;
metadata = Boolean.TRUE;
supportedVendorExtensions = Boolean.TRUE;
@@ -234,24 +230,6 @@ private void generateMdSupportedVendorExtensions(StringBuilder sb, CodegenConfig
sb.append(newline);
}
- private void generateMdImportMappings(StringBuilder sb, CodegenConfig config) {
- sb.append(newline).append("## IMPORT MAPPING").append(newline).append(newline);
-
- sb.append("| Type/Alias | Imports |").append(newline);
- sb.append("| ---------- | ------- |").append(newline);
-
- config.importMapping()
- .entrySet()
- .stream()
- .sorted(Map.Entry.comparingByKey())
- .forEachOrdered(kvp -> {
- sb.append("|").append(escapeHtml4(kvp.getKey())).append("|").append(escapeHtml4(kvp.getValue())).append("|");
- sb.append(newline);
- });
-
- sb.append(newline);
- }
-
private void generateMdInstantiationTypes(StringBuilder sb, CodegenConfig config) {
sb.append(newline).append("## INSTANTIATION TYPES").append(newline).append(newline);
@@ -372,10 +350,6 @@ private void generateMarkdownHelp(StringBuilder sb, CodegenConfig config) {
generateMdSupportedVendorExtensions(sb, config);
}
- if (Boolean.TRUE.equals(importMappings)) {
- generateMdImportMappings(sb, config);
- }
-
if (Boolean.TRUE.equals(instantiationTypes)) {
generateMdInstantiationTypes(sb, config);
}
@@ -446,18 +420,6 @@ private void generatePlainTextHelp(StringBuilder sb, CodegenConfig config) {
sb.append(newline).append(newline);
});
- if (Boolean.TRUE.equals(importMappings)) {
- sb.append(newline).append("IMPORT MAPPING").append(newline).append(newline);
- Map map = config.importMapping()
- .entrySet()
- .stream()
- .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> {
- throw new IllegalStateException(String.format(Locale.ROOT, "Duplicated options! %s and %s", a, b));
- }, TreeMap::new));
- writePlainTextFromMap(sb, map, optIndent, optNestedIndent, "Type/Alias", "Imports");
- sb.append(newline);
- }
-
if (Boolean.TRUE.equals(schemaMappings)) {
sb.append(newline).append("SCHEMA MAPPING").append(newline).append(newline);
Map map = config.schemaMapping()
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java
similarity index 92%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java
index 02f6f99f613..2aa3646c770 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-import static org.openapitools.codegen.config.CodegenConfiguratorUtils.*;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.spi.FilterAttachable;
@@ -30,8 +29,13 @@
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.config.CodegenConfigurator;
+import org.openapijsonschematools.codegen.ClientOptInput;
+import org.openapijsonschematools.codegen.CodegenConstants;
+import org.openapijsonschematools.codegen.DefaultGenerator;
+import org.openapijsonschematools.codegen.Generator;
+import org.openapijsonschematools.codegen.GeneratorNotFoundException;
+import org.openapijsonschematools.codegen.config.CodegenConfigurator;
+import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -263,9 +267,6 @@ public class Generate extends OpenApiGeneratorCommand {
@Option(name = {"--enable-post-process-file"}, title = "enable post-processing of files (in generators supporting it)", description = CodegenConstants.ENABLE_POST_PROCESS_FILE_DESC)
private Boolean enablePostProcessFile;
- @Option(name = {"--generate-alias-as-model"}, title = "generate alias (array, map) as model", description = CodegenConstants.GENERATE_ALIAS_AS_MODEL_DESC)
- private Boolean generateAliasAsModel;
-
@Option(name = {"--legacy-discriminator-behavior"}, title = "Support legacy logic for evaluating discriminators", description = CodegenConstants.LEGACY_DISCRIMINATOR_BEHAVIOR_DESC)
private Boolean legacyDiscriminatorBehavior;
@@ -278,7 +279,7 @@ public class Generate extends OpenApiGeneratorCommand {
public void execute() {
if (logToStderr != null) {
LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
- Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapitools")
+ Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapijsonschematools")
.map(lc::getLogger)
.peek(logger -> logger.detachAppender("STDOUT"))
.reduce((logger, next) -> logger.getName().equals(Logger.ROOT_LOGGER_NAME) ? logger : next)
@@ -427,10 +428,6 @@ public void execute() {
configurator.setEnablePostProcessFile(enablePostProcessFile);
}
- if (generateAliasAsModel != null) {
- configurator.setGenerateAliasAsModel(generateAliasAsModel);
- }
-
if (minimalUpdate != null) {
configurator.setEnableMinimalUpdate(minimalUpdate);
}
@@ -440,18 +437,18 @@ public void execute() {
}
if (globalProperties != null && !globalProperties.isEmpty()) {
- applyGlobalPropertiesKvpList(globalProperties, configurator);
- }
- applyInstantiationTypesKvpList(instantiationTypes, configurator);
- applyImportMappingsKvpList(importMappings, configurator);
- applySchemaMappingsKvpList(schemaMappings, configurator);
- applyInlineSchemaNameMappingsKvpList(inlineSchemaNameMappings, configurator);
- applyInlineSchemaNameDefaultsKvpList(inlineSchemaNameDefaults, configurator);
- applyTypeMappingsKvpList(typeMappings, configurator);
- applyAdditionalPropertiesKvpList(additionalProperties, configurator);
- applyLanguageSpecificPrimitivesCsvList(languageSpecificPrimitives, configurator);
- applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator);
- applyServerVariablesKvpList(serverVariableOverrides, configurator);
+ CodegenConfiguratorUtils.applyGlobalPropertiesKvpList(globalProperties, configurator);
+ }
+ CodegenConfiguratorUtils.applyInstantiationTypesKvpList(instantiationTypes, configurator);
+ CodegenConfiguratorUtils.applyImportMappingsKvpList(importMappings, configurator);
+ CodegenConfiguratorUtils.applySchemaMappingsKvpList(schemaMappings, configurator);
+ CodegenConfiguratorUtils.applyInlineSchemaNameMappingsKvpList(inlineSchemaNameMappings, configurator);
+ CodegenConfiguratorUtils.applyInlineSchemaNameDefaultsKvpList(inlineSchemaNameDefaults, configurator);
+ CodegenConfiguratorUtils.applyTypeMappingsKvpList(typeMappings, configurator);
+ CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList(additionalProperties, configurator);
+ CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsvList(languageSpecificPrimitives, configurator);
+ CodegenConfiguratorUtils.applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator);
+ CodegenConfiguratorUtils.applyServerVariablesKvpList(serverVariableOverrides, configurator);
try {
final ClientOptInput clientOptInput = configurator.toClientOptInput();
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java
similarity index 96%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java
index 7c8cc543bcd..759500d2356 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java
@@ -14,21 +14,17 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.TreeNode;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.util.TokenBuffer;
import io.airlift.airline.Arguments;
@@ -36,12 +32,12 @@
import io.airlift.airline.Option;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.ClientOptInput;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.config.CodegenConfigurator;
-import org.openapitools.codegen.config.DynamicSettings;
-import org.openapitools.codegen.config.GlobalSettings;
+import org.openapijsonschematools.codegen.ClientOptInput;
+import org.openapijsonschematools.codegen.CodegenConfig;
+import org.openapijsonschematools.codegen.DefaultGenerator;
+import org.openapijsonschematools.codegen.config.CodegenConfigurator;
+import org.openapijsonschematools.codegen.config.DynamicSettings;
+import org.openapijsonschematools.codegen.config.GlobalSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -147,7 +143,7 @@ public void execute() {
// it doesn't make sense to interleave INFO level logs, so limit these to only ERROR.
LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
- Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapitools")
+ Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapijsonschematools")
.map(lc::getLogger)
.forEach(logger -> logger.setLevel(Level.ERROR));
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/GlobalOptions.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GlobalOptions.java
similarity index 88%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/GlobalOptions.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GlobalOptions.java
index 3333d30b08e..4290172bcdd 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/GlobalOptions.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GlobalOptions.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Option;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/HelpCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java
similarity index 88%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/HelpCommand.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java
index aab582beb3a..dd3e1bf05d0 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/HelpCommand.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Command;
import io.airlift.airline.Help;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java
similarity index 93%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java
index 8a178193240..e98aaf5879b 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/ListGenerators.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import com.google.common.base.Objects;
@@ -6,11 +6,11 @@
import io.airlift.airline.Option;
import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenConfigLoader;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.meta.GeneratorMetadata;
-import org.openapitools.codegen.meta.Stability;
+import org.openapijsonschematools.codegen.CodegenConfig;
+import org.openapijsonschematools.codegen.CodegenConfigLoader;
+import org.openapijsonschematools.codegen.CodegenType;
+import org.openapijsonschematools.codegen.meta.GeneratorMetadata;
+import org.openapijsonschematools.codegen.meta.Stability;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java
similarity index 93%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java
index 52043e2ce0c..e34b6e2b1bf 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import static ch.lambdaj.collection.LambdaCollections.with;
import static com.google.common.base.Joiner.on;
@@ -27,20 +27,18 @@
import io.airlift.airline.Command;
import io.airlift.airline.Option;
import org.apache.commons.io.FileUtils;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.SupportingFile;
-import org.openapitools.codegen.TemplateManager;
-import org.openapitools.codegen.api.TemplatePathLocator;
-import org.openapitools.codegen.templating.MustacheEngineAdapter;
-import org.openapitools.codegen.templating.TemplateManagerOptions;
-import org.openapitools.codegen.templating.CommonTemplateContentLocator;
+import org.openapijsonschematools.codegen.CodegenConfig;
+import org.openapijsonschematools.codegen.SupportingFile;
+import org.openapijsonschematools.codegen.TemplateManager;
+import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator;
+import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter;
+import org.openapijsonschematools.codegen.templating.TemplateManagerOptions;
+import org.openapijsonschematools.codegen.api.TemplatePathLocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
-import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
@@ -70,8 +68,8 @@ public class Meta extends OpenApiGeneratorCommand {
private String name = "default";
@Option(name = {"-p", "--package"}, title = "package",
- description = "the package to put the main class into (defaults to org.openapitools.codegen)")
- private String targetPackage = "org.openapitools.codegen";
+ description = "the package to put the main class into (defaults to org.openapijsonschematools.codegen)")
+ private String targetPackage = "org.openapijsonschematools.codegen";
@Option(name = {"-t", "--type"}, title = "type",
description = "the type of generator that is created",
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/OpenApiGeneratorCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/OpenApiGeneratorCommand.java
similarity index 94%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/OpenApiGeneratorCommand.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/OpenApiGeneratorCommand.java
index 47ee715d3dc..0a44803ee14 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/OpenApiGeneratorCommand.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/OpenApiGeneratorCommand.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Help;
import io.airlift.airline.model.GlobalMetadata;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java
similarity index 93%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java
index 726aaf300d6..e1fa4caf294 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Validate.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Command;
import io.airlift.airline.Option;
@@ -25,9 +25,9 @@
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
import org.apache.commons.text.WordUtils;
-import org.openapitools.codegen.validation.ValidationResult;
-import org.openapitools.codegen.validations.oas.OpenApiEvaluator;
-import org.openapitools.codegen.validations.oas.RuleConfiguration;
+import org.openapijsonschematools.codegen.validations.oas.OpenApiEvaluator;
+import org.openapijsonschematools.codegen.validations.oas.RuleConfiguration;
+import org.openapijsonschematools.codegen.validation.ValidationResult;
import java.util.HashSet;
import java.util.List;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Version.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Version.java
similarity index 96%
rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Version.java
rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Version.java
index 3c47fc2cbc6..7228f8c22d8 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/cmd/Version.java
+++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Version.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Command;
import io.airlift.airline.Option;
diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/Constants.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/Constants.java
deleted file mode 100644
index 863f1783828..00000000000
--- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapitools/codegen/Constants.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.openapitools.codegen;
-
-public class Constants {
- private Constants(){ }
-
- public static final String CLI_NAME = "openapi-generator-cli";
- public static final String GIT_REPO = "https://github.com/openapitools/openapi-generator";
- public static final String SITE = "https://openapi-generator.tech/";
-}
diff --git a/modules/openapi-json-schema-generator-cli/src/main/resources/logback.xml b/modules/openapi-json-schema-generator-cli/src/main/resources/logback.xml
index 0577ae5e15d..f6a72cfc9d8 100644
--- a/modules/openapi-json-schema-generator-cli/src/main/resources/logback.xml
+++ b/modules/openapi-json-schema-generator-cli/src/main/resources/logback.xml
@@ -67,7 +67,7 @@
-
+
diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java
similarity index 97%
rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java
rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java
index 4826464ad91..bf7a200fe19 100644
--- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/AuthorTemplateTest.java
+++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Cli;
import org.testng.Assert;
@@ -9,7 +9,6 @@
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Arrays;
public class AuthorTemplateTest {
Path outputDirectory;
diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateBatchTest.java
similarity index 94%
rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java
rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateBatchTest.java
index ce446523f1e..88d4af49128 100644
--- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateBatchTest.java
+++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateBatchTest.java
@@ -1,12 +1,11 @@
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.openapitools.codegen.config.CodegenConfigurator;
-import org.openapitools.codegen.config.Context;
-import org.openapitools.codegen.config.GeneratorSettings;
-import org.openapitools.codegen.config.WorkflowSettings;
+import org.openapijsonschematools.codegen.config.CodegenConfigurator;
+import org.openapijsonschematools.codegen.config.Context;
+import org.openapijsonschematools.codegen.config.GeneratorSettings;
+import org.openapijsonschematools.codegen.config.WorkflowSettings;
import org.testng.ITestContext;
-import org.testng.TestRunner;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java
similarity index 96%
rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java
rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java
index 5b013006739..71a3df0e6cd 100644
--- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/GenerateTest.java
+++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java
@@ -15,16 +15,14 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd;
+package org.openapijsonschematools.codegen.cmd;
import io.airlift.airline.Cli;
import org.apache.commons.lang3.ArrayUtils;
import org.mockito.MockSettings;
-import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.Generator;
-import org.openapitools.codegen.SpecValidationException;
-import org.openapitools.codegen.config.CodegenConfigurator;
-import org.testng.TestException;
+import org.openapijsonschematools.codegen.DefaultGenerator;
+import org.openapijsonschematools.codegen.Generator;
+import org.openapijsonschematools.codegen.config.CodegenConfigurator;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -433,11 +431,12 @@ public void testVerboseShort() {
verifyNoMoreInteractions(configurator);
}
- /**
- * This test ensures that when the
- */
- @Test(expectedExceptions = SpecValidationException.class)
- public void testNPEWithInvalidSpecFile() {
- setupAndRunTest("-i", "src/test/resources/npe-test.yaml", "-g", "java", "-o", "src/main/java", false, null);
- }
+// /**
+// * This test ensures that a NPE is thrown
+// * Test stopped passing when swagger-parser setResolve was switched to false
+// */
+// @Test(expectedExceptions = SpecValidationException.class)
+// public void testNPEWithInvalidSpecFile() {
+// setupAndRunTest("-i", "src/test/resources/npe-test.yaml", "-g", "java", "-o", "src/main/java", false, null);
+// }
}
diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/utils/OptionUtilsTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java
similarity index 96%
rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/utils/OptionUtilsTest.java
rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java
index 37c4039423b..b83da92b592 100644
--- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapitools/codegen/cmd/utils/OptionUtilsTest.java
+++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.openapitools.codegen.cmd.utils;
+package org.openapijsonschematools.codegen.cmd.utils;
-import org.openapitools.codegen.utils.OptionUtils;
+import org.openapijsonschematools.codegen.utils.OptionUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.testng.annotations.Test;
diff --git a/modules/openapi-json-schema-generator-core/pom.xml b/modules/openapi-json-schema-generator-core/pom.xml
index 99de23801b2..46882a785ed 100644
--- a/modules/openapi-json-schema-generator-core/pom.xml
+++ b/modules/openapi-json-schema-generator-core/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
openapi-json-schema-generator-project
- org.openapitools
+ org.openapijsonschematools${revision}../..
@@ -12,7 +12,7 @@
openapi-json-schema-generator-coreopenapi-json-schema-generator-core
- https://github.com/openapitools/openapi-json-schema-generator
+ https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/AbstractTemplatingEngineAdapter.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/AbstractTemplatingEngineAdapter.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java
index 6c568f6ad3b..83081fe4799 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/AbstractTemplatingEngineAdapter.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
import java.util.Locale;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateDefinition.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java
similarity index 98%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateDefinition.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java
index 51d6c929e03..745130322b9 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateDefinition.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
import java.util.Objects;
import java.util.StringJoiner;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateFileType.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateFileType.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java
index 68ff5610fe3..b94992b2565 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateFileType.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
import java.util.StringJoiner;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatePathLocator.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java
similarity index 88%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatePathLocator.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java
index 9bcd4e2cc8b..60021d55c51 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatePathLocator.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
/**
* Provides means for searching for "actual" template location based on relative template file.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateProcessor.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateProcessor.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java
index 536d2d89ac9..0c848ded59d 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplateProcessor.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
import java.io.File;
import java.io.IOException;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingEngineAdapter.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java
similarity index 98%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingEngineAdapter.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java
index 34666bf7a2c..f7474949b10 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingEngineAdapter.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingExecutor.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java
similarity index 94%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingExecutor.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java
index d0fbb86b5db..a0ba2813c50 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingExecutor.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
import java.nio.file.Path;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingGenerator.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java
similarity index 95%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingGenerator.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java
index 86f306a790b..03d71b88f8a 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/api/TemplatingGenerator.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.api;
+package org.openapijsonschematools.codegen.api;
// TODO: 6.0 Remove
/**
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/Context.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/Context.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/Context.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/Context.java
index 4aceaacb2c4..01cc07f71d9 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/Context.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/Context.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.config;
+package org.openapijsonschematools.codegen.config;
/**
* The Context used for generation.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java
similarity index 99%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java
index c14a06721e8..e2430e049a6 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.config;
+package org.openapijsonschematools.codegen.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -315,7 +315,7 @@ public String getGitHost() {
}
/**
- * Gets git user id. e.g. openapitools.
+ * Gets git user id. e.g. openapijsonschematools.
*
* Generally used by git_push.sh in generated sources which support it.
* This value may also be used by templates in maven style references, READMEs, or other documentation.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
similarity index 94%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
index 020dad9e507..30deab3fab3 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.config;
+package org.openapijsonschematools.codegen.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +45,6 @@ public class WorkflowSettings {
public static final boolean DEFAULT_ENABLE_POST_PROCESS_FILE = false;
public static final boolean DEFAULT_ENABLE_MINIMAL_UPDATE = false;
public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true;
- public static final boolean DEFAULT_GENERATE_ALIAS_AS_MODEL = false;
public static final String DEFAULT_TEMPLATING_ENGINE_NAME = null; // this is set by the generator
public static final Map DEFAULT_GLOBAL_PROPERTIES = Collections.unmodifiableMap(new HashMap<>());
@@ -60,7 +59,6 @@ public class WorkflowSettings {
private boolean enablePostProcessFile = DEFAULT_ENABLE_POST_PROCESS_FILE;
private boolean enableMinimalUpdate = DEFAULT_ENABLE_MINIMAL_UPDATE;
private boolean strictSpecBehavior = DEFAULT_STRICT_SPEC_BEHAVIOR;
- private boolean generateAliasAsModel = DEFAULT_GENERATE_ALIAS_AS_MODEL;
private String templateDir;
private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
private String ignoreFileOverride;
@@ -82,7 +80,6 @@ private WorkflowSettings(Builder builder) {
this.templatingEngineName = builder.templatingEngineName;
this.ignoreFileOverride = builder.ignoreFileOverride;
this.globalProperties = Collections.unmodifiableMap(builder.globalProperties);
- this.generateAliasAsModel = builder.generateAliasAsModel;
}
/**
@@ -109,7 +106,6 @@ public static Builder newBuilder(WorkflowSettings copy) {
builder.validateSpec = copy.isValidateSpec();
builder.enablePostProcessFile = copy.isEnablePostProcessFile();
builder.enableMinimalUpdate = copy.isEnableMinimalUpdate();
- builder.generateAliasAsModel = copy.isGenerateAliasAsModel();
builder.strictSpecBehavior = copy.isStrictSpecBehavior();
builder.templatingEngineName = copy.getTemplatingEngineName();
builder.ignoreFileOverride = copy.getIgnoreFileOverride();
@@ -227,15 +223,6 @@ public boolean isEnableMinimalUpdate() {
return enableMinimalUpdate;
}
- /**
- * Indicates whether or not the generation should convert aliases (primitives defined as schema for use within documents) as models.
- *
- * @return true if generate-alias-as-model is enabled, otherwise false.
- */
- public boolean isGenerateAliasAsModel() {
- return generateAliasAsModel;
- }
-
/**
* Indicates whether or not 'MUST' and 'SHALL' wording in the api specification is strictly adhered to.
* For example, when false, no automatic 'fixes' will be applied to documents which pass validation but don't follow the spec.
@@ -308,7 +295,6 @@ public static final class Builder {
private Boolean enablePostProcessFile = DEFAULT_ENABLE_POST_PROCESS_FILE;
private Boolean enableMinimalUpdate = DEFAULT_ENABLE_MINIMAL_UPDATE;
private Boolean strictSpecBehavior = DEFAULT_STRICT_SPEC_BEHAVIOR;
- private Boolean generateAliasAsModel = DEFAULT_GENERATE_ALIAS_AS_MODEL;
private String templateDir;
private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
private String ignoreFileOverride;
@@ -447,18 +433,6 @@ public Builder withStrictSpecBehavior(Boolean strictSpecBehavior) {
return this;
}
- /**
- * Sets the {@code generateAliasAsModel} and returns a reference to this Builder so that the methods can be chained together.
- * An 'alias' is a primitive type defined as a schema, and this option will attempt to construct a model for that primitive.
- *
- * @param generateAliasAsModel the {@code generateAliasAsModel} to set
- * @return a reference to this Builder
- */
- public Builder withGenerateAliasAsModel(Boolean generateAliasAsModel) {
- this.generateAliasAsModel = generateAliasAsModel != null ? generateAliasAsModel : Boolean.valueOf(DEFAULT_GENERATE_ALIAS_AS_MODEL);
- return this;
- }
-
/**
* Sets the {@code templateDir} and returns a reference to this Builder so that the methods can be chained together.
*
@@ -586,7 +560,6 @@ public String toString() {
", templatingEngineName='" + templatingEngineName + '\'' +
", ignoreFileOverride='" + ignoreFileOverride + '\'' +
", globalProperties=" + globalProperties +
- ", generateAliasAsModel=" + generateAliasAsModel +
'}';
}
@@ -604,7 +577,6 @@ public boolean equals(Object o) {
isEnablePostProcessFile() == that.isEnablePostProcessFile() &&
isEnableMinimalUpdate() == that.isEnableMinimalUpdate() &&
isStrictSpecBehavior() == that.isStrictSpecBehavior() &&
- isGenerateAliasAsModel() == that.isGenerateAliasAsModel() &&
Objects.equals(getInputSpec(), that.getInputSpec()) &&
Objects.equals(getOutputDir(), that.getOutputDir()) &&
Objects.equals(getTemplateDir(), that.getTemplateDir()) &&
@@ -624,7 +596,6 @@ public int hashCode() {
isSkipOperationExample(),
isLogToStderr(),
isValidateSpec(),
- isGenerateAliasAsModel(),
isEnablePostProcessFile(),
isEnableMinimalUpdate(),
isStrictSpecBehavior(),
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java
similarity index 79%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java
index db98fe2be7b..16829b176be 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java
@@ -14,10 +14,19 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta;
-
-import org.openapitools.codegen.meta.features.*;
-import org.openapitools.codegen.meta.features.annotations.AnnotationType;
+package org.openapijsonschematools.codegen.meta;
+
+import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature;
+import org.openapijsonschematools.codegen.meta.features.ComponentsFeature;
+import org.openapijsonschematools.codegen.meta.features.DataTypeFeature;
+import org.openapijsonschematools.codegen.meta.features.DocumentationFeature;
+import org.openapijsonschematools.codegen.meta.features.GlobalFeature;
+import org.openapijsonschematools.codegen.meta.features.OperationFeature;
+import org.openapijsonschematools.codegen.meta.features.ParameterFeature;
+import org.openapijsonschematools.codegen.meta.features.SchemaFeature;
+import org.openapijsonschematools.codegen.meta.features.SecurityFeature;
+import org.openapijsonschematools.codegen.meta.features.WireFormatFeature;
+import org.openapijsonschematools.codegen.meta.features.annotations.AnnotationType;
import java.lang.annotation.Annotation;
import java.util.*;
@@ -32,11 +41,13 @@ public class FeatureSet {
private EnumSet clientModificationFeatures;
private EnumSet dataTypeFeatures;
+ private EnumSet componentsFeatures;
private EnumSet documentationFeatures;
private EnumSet globalFeatures;
- private EnumSet schemaSupportFeatures;
+ private EnumSet schemaFeatures;
private EnumSet parameterFeatures;
private EnumSet securityFeatures;
+ private EnumSet operationFeatures;
private EnumSet wireFormatFeatures;
private FeatureSet(Builder builder) {
@@ -44,11 +55,13 @@ private FeatureSet(Builder builder) {
clientModificationFeatures = builder.clientModificationFeatures;
dataTypeFeatures = builder.dataTypeFeatures;
documentationFeatures = builder.documentationFeatures;
- schemaSupportFeatures = builder.schemaSupportFeatures;
+ schemaFeatures = builder.schemaFeatures;
+ componentsFeatures = builder.componentsFeatures;
globalFeatures = builder.globalFeatures;
parameterFeatures = builder.parameterFeatures;
securityFeatures = builder.securityFeatures;
wireFormatFeatures = builder.wireFormatFeatures;
+ operationFeatures = builder.operationFeatures;
}
}
@@ -66,15 +79,24 @@ public static Builder newBuilder(FeatureSet copy) {
builder.clientModificationFeatures = copy.getClientModificationFeatures();
builder.dataTypeFeatures = copy.getDataTypeFeatures();
builder.documentationFeatures = copy.getDocumentationFeatures();
- builder.schemaSupportFeatures = copy.getSchemaSupportFeatures();
+ builder.schemaFeatures = copy.getSchemaSupportFeatures();
builder.globalFeatures = copy.getGlobalFeatures();
builder.parameterFeatures = copy.getParameterFeatures();
builder.securityFeatures = copy.getSecurityFeatures();
builder.wireFormatFeatures = copy.getWireFormatFeatures();
+ builder.operationFeatures = copy.getOperationFeatures();
}
return builder;
}
+ public EnumSet getOperationFeatures() {
+ if (operationFeatures != null) {
+ return EnumSet.copyOf(operationFeatures);
+ } else {
+ return EnumSet.noneOf(OperationFeature.class);
+ }
+ }
+
/**
* Returns the set of client modification features supported by the generator.
*
@@ -119,11 +141,19 @@ public EnumSet getDocumentationFeatures() {
*
* @return A new copy of the defined feature set. Changes to this instance are not promoted.
*/
- public EnumSet getSchemaSupportFeatures() {
- if (schemaSupportFeatures != null) {
- return EnumSet.copyOf(schemaSupportFeatures);
+ public EnumSet getSchemaSupportFeatures() {
+ if (schemaFeatures != null) {
+ return EnumSet.copyOf(schemaFeatures);
} else {
- return EnumSet.noneOf(SchemaSupportFeature.class);
+ return EnumSet.noneOf(SchemaFeature.class);
+ }
+ }
+
+ public EnumSet getComponentsFeatures() {
+ if (componentsFeatures != null) {
+ return EnumSet.copyOf(componentsFeatures);
+ } else {
+ return EnumSet.noneOf(ComponentsFeature.class);
}
}
@@ -256,14 +286,14 @@ public List flatten() {
states.add(state);
});
- EnumSet.allOf(SchemaSupportFeature.class).forEach(feat -> {
+ EnumSet.allOf(SchemaFeature.class).forEach(feat -> {
FeatureSetFlattened state = new FeatureSetFlattened();
- state.featureCategory = SchemaSupportFeature.class.getSimpleName();
+ state.featureCategory = SchemaFeature.class.getSimpleName();
state.featureName = feat.name();
- state.isSupported = this.schemaSupportFeatures.contains(feat);
+ state.isSupported = this.schemaFeatures.contains(feat);
try {
- for (Annotation an : SchemaSupportFeature.class.getField(feat.name()).getAnnotations()) {
+ for (Annotation an : SchemaFeature.class.getField(feat.name()).getAnnotations()) {
state.source.add(AnnotationType.fromAnnotation(an.annotationType()));
}
} catch (NoSuchFieldException e) {
@@ -288,6 +318,22 @@ public List flatten() {
states.add(state);
});
+ EnumSet.allOf(ComponentsFeature.class).forEach(feat -> {
+ FeatureSetFlattened state = new FeatureSetFlattened();
+ state.featureCategory = ComponentsFeature.class.getSimpleName();
+ state.featureName = feat.name();
+ state.isSupported = this.componentsFeatures.contains(feat);
+
+ try {
+ for (Annotation an : ComponentsFeature.class.getField(feat.name()).getAnnotations()) {
+ state.source.add(AnnotationType.fromAnnotation(an.annotationType()));
+ }
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ }
+
+ states.add(state);
+ });
EnumSet.allOf(ParameterFeature.class).forEach(feat -> {
FeatureSetFlattened state = new FeatureSetFlattened();
state.featureCategory = ParameterFeature.class.getSimpleName();
@@ -320,6 +366,22 @@ public List flatten() {
states.add(state);
});
+ EnumSet.allOf(OperationFeature.class).forEach(feat -> {
+ FeatureSetFlattened state = new FeatureSetFlattened();
+ state.featureCategory = OperationFeature.class.getSimpleName();
+ state.featureName = feat.name();
+ state.isSupported = this.operationFeatures.contains(feat);
+
+ try {
+ for (Annotation an : OperationFeature.class.getField(feat.name()).getAnnotations()) {
+ state.source.add(AnnotationType.fromAnnotation(an.annotationType()));
+ }
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ }
+
+ states.add(state);
+ });
EnumSet.allOf(WireFormatFeature.class).forEach(feat -> {
FeatureSetFlattened state = new FeatureSetFlattened();
state.featureCategory = WireFormatFeature.class.getSimpleName();
@@ -347,21 +409,46 @@ public static final class Builder {
private EnumSet clientModificationFeatures;
private EnumSet dataTypeFeatures;
private EnumSet documentationFeatures;
- private EnumSet schemaSupportFeatures;
+ private EnumSet schemaFeatures;
+
+ private EnumSet componentsFeatures;
private EnumSet globalFeatures;
private EnumSet parameterFeatures;
private EnumSet securityFeatures;
private EnumSet wireFormatFeatures;
+ private EnumSet operationFeatures;
+
private Builder() {
this.clientModificationFeatures = EnumSet.noneOf(ClientModificationFeature.class);
this.dataTypeFeatures = EnumSet.noneOf(DataTypeFeature.class);
this.documentationFeatures = EnumSet.noneOf(DocumentationFeature.class);
- this.schemaSupportFeatures = EnumSet.noneOf(SchemaSupportFeature.class);
+ this.schemaFeatures = EnumSet.noneOf(SchemaFeature.class);
this.parameterFeatures = EnumSet.noneOf(ParameterFeature.class);
this.securityFeatures = EnumSet.noneOf(SecurityFeature.class);
this.globalFeatures = EnumSet.noneOf(GlobalFeature.class);
+ this.componentsFeatures = EnumSet.noneOf(ComponentsFeature.class);
this.wireFormatFeatures = EnumSet.noneOf(WireFormatFeature.class);
+ this.operationFeatures = EnumSet.noneOf(OperationFeature.class);
+ }
+
+ public Builder operationFeatures(EnumSet operationFeatures) {
+ if (operationFeatures != null) {
+ this.operationFeatures = operationFeatures;
+ } else {
+ this.operationFeatures = EnumSet.noneOf(OperationFeature.class);
+ }
+ return this;
+ }
+
+ public Builder includeOperationFeatures(OperationFeature... operationFeature) {
+ this.operationFeatures.addAll(Arrays.stream(operationFeature).collect(Collectors.toList()));
+ return this;
+ }
+
+ public Builder excludeOperationFeatures(OperationFeature... operationFeature) {
+ this.operationFeatures.removeAll(Arrays.stream(operationFeature).collect(Collectors.toList()));
+ return this;
}
/**
@@ -484,39 +571,39 @@ public Builder excludeDocumentationFeatures(DocumentationFeature... documentatio
/**
* Sets the {@code schemaSupportFeature} and returns a reference to this Builder so that the methods can be chained together.
*
- * @param schemaSupportFeatures the {@code schemaSupportFeature} to set
+ * @param schemaFeatures the {@code schemaSupportFeature} to set
* @return a reference to this Builder
*/
- public Builder schemaSupportFeatures(EnumSet schemaSupportFeatures) {
- if (schemaSupportFeatures != null) {
- this.schemaSupportFeatures = schemaSupportFeatures;
+ public Builder schemaFeatures(EnumSet schemaFeatures) {
+ if (schemaFeatures != null) {
+ this.schemaFeatures = schemaFeatures;
} else {
- this.schemaSupportFeatures = EnumSet.noneOf(SchemaSupportFeature.class);
+ this.schemaFeatures = EnumSet.noneOf(SchemaFeature.class);
}
return this;
}
/**
- * Includes the defined {@link SchemaSupportFeature} to the new/existing set of supported features.
+ * Includes the defined {@link SchemaFeature} to the new/existing set of supported features.
*
- * @param schemaSupportFeature One or more {@code schemaSupportFeature} to ensure are included in the set.
+ * @param schemaFeature One or more {@code schemaFeature} to ensure are included in the set.
*
* @return a reference to this Builder
*/
- public Builder includeSchemaSupportFeatures(SchemaSupportFeature... schemaSupportFeature) {
- this.schemaSupportFeatures.addAll(Arrays.stream(schemaSupportFeature).collect(Collectors.toList()));
+ public Builder includeSchemaFeatures(SchemaFeature... schemaFeature) {
+ this.schemaFeatures.addAll(Arrays.stream(schemaFeature).collect(Collectors.toList()));
return this;
}
/**
- * Excludes the defined {@link SchemaSupportFeature} from the set of supported features.
+ * Excludes the defined {@link SchemaFeature} from the set of supported features.
*
- * @param schemaSupportFeature One or more {@code schemaSupportFeature} to ensure are excluded from the set.
+ * @param schemaFeature One or more {@code schemaFeature} to ensure are excluded from the set.
*
* @return a reference to this Builder
*/
- public Builder excludeSchemaSupportFeatures(SchemaSupportFeature... schemaSupportFeature) {
- this.schemaSupportFeatures.removeAll(Arrays.stream(schemaSupportFeature).collect(Collectors.toList()));
+ public Builder excludeSchemaFeatures(SchemaFeature... schemaFeature) {
+ this.schemaFeatures.removeAll(Arrays.stream(schemaFeature).collect(Collectors.toList()));
return this;
}
@@ -598,6 +685,25 @@ public Builder excludeSecurityFeatures(SecurityFeature... securityFeature) {
return this;
}
+ public Builder componentsFeatures(EnumSet componentsFeatures) {
+ if (componentsFeatures != null) {
+ this.componentsFeatures = componentsFeatures;
+ } else {
+ this.componentsFeatures = EnumSet.noneOf(ComponentsFeature.class);
+ }
+ return this;
+ }
+
+ public Builder includeComponentsFeatures(ComponentsFeature... componentsFeature) {
+ this.componentsFeatures.addAll(Arrays.stream(componentsFeature).collect(Collectors.toList()));
+ return this;
+ }
+
+ public Builder excludeComponentsFeatures(ComponentsFeature... componentsFeature) {
+ this.componentsFeatures.removeAll(Arrays.stream(componentsFeature).collect(Collectors.toList()));
+ return this;
+ }
+
/**
* Sets the {@code globalFeatures} and return a reference to this Builder so that the methods can be chained together.
*
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/GeneratorMetadata.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java
similarity index 99%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/GeneratorMetadata.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java
index 6916e2c7307..4564c67b148 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/GeneratorMetadata.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta;
+package org.openapijsonschematools.codegen.meta;
import java.util.HashMap;
import java.util.Map;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/Stability.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/Stability.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java
index bc79af24309..e236cb384c7 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/Stability.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta;
+package org.openapijsonschematools.codegen.meta;
/**
* Represents the "stability index" of a generator or feature, based on the stability indexes defined in the node.js ecosystem.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/ClientModificationFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java
similarity index 89%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/ClientModificationFeature.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java
index a53c354a6db..9534629eae0 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/ClientModificationFeature.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta.features;
+package org.openapijsonschematools.codegen.meta.features;
-import org.openapitools.codegen.meta.features.annotations.ToolingExtension;
+import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension;
/**
* Defines a general set of modifications supported by a generated client.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java
new file mode 100644
index 00000000000..c16e3ac63c0
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2023 OpenAPI-Json-Schema-Generator Contributors
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+
+public enum ComponentsFeature {
+ @OAS3
+ schemas,
+
+ @OAS3
+ responses,
+
+ @OAS3
+ parameters,
+
+ @OAS3
+ examples,
+
+ @OAS3
+ requestBodies,
+
+ @OAS3
+ headers,
+
+ @OAS3
+ securitySchemes,
+
+ @OAS3
+ links,
+
+ @OAS3
+ callbacks,
+
+ @OAS3
+ pathItems
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java
new file mode 100644
index 00000000000..12dd7c09df2
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension;
+
+/**
+ * Defines common data types supported by a generator.
+ * Some of these features are defined in specs, and some are specific to the tool.
+ *
+ * Where data types are listed as tool-specific, this either indicates that the data type is common enough that it is an officially
+ * supported custom data type by the toolset, or that the consideration of a special type isn't
+ * explicitly mentioned by the specification(s) but differs enough across languages that it warrants a special callout.
+ */
+public enum DataTypeFeature {
+ /**
+ * Supports a generator-specific support usually via type=string's format property (e.g. email, uuid, etc), should be documented in generator README.
+ *
+ *
Loosely described in OpenAPI Specification(s). Generally means a custom "format" option applied to a string-typed property.
+ * This should be used as an indicator for password best practices, such as assigning a variable to
+ * a character array rather than string, avoiding logging the variable in clear text, and masking the value
+ * in any user inputs. See OWASP for best practices.
+ *
+ * OAS 3.x does not have an explicit "file" type and instead relies on ContentType or response types.
+ * That's not to say a generator doesn't support files, only that there's no direct
+ * "file" type defined in the spec document.
+ *
+ *
+ * NOTE: The default workflow may provide an "isFile" helper or synthesize the assumptions around files in the case of OAS 3.x.
+ *
+ */
+ @OAS2
+ File,
+
+ /**
+ * String uuid data
+ */
+ @OAS2 @OAS3
+ Uuid,
+
+ /**
+ * Supports arrays of data
+ */
+ @OAS2 @OAS3
+ Array,
+
+ /**
+ * A JSON "null" value added in openapi v3.1.0
+ */
+ @OAS3
+ Null,
+
+ /**
+ * When no type is defined, any data type is accepted
+ */
+ @OAS2 @OAS3
+ AnyType,
+
+ /**
+ * An unordered set of properties mapping a string to an instance
+ */
+ @OAS2 @OAS3
+ Object,
+
+ /**
+ * Supports enum properties
+ */
+ @OAS2 @OAS3
+ Enum
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java
new file mode 100644
index 00000000000..d42a1747a6f
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension;
+
+/**
+ * Defines the documentation type available in generated output.
+ */
+public enum DocumentationFeature {
+ /**
+ * Generated output includes a README.
+ */
+ @ToolingExtension
+ Readme,
+
+ @OAS3
+ Servers,
+
+ @OAS2 @OAS3
+ Security,
+
+ @OAS3
+ ComponentSchemas,
+
+ @OAS3
+ ComponentResponses,
+
+ @OAS3
+ ComponentParameters,
+
+ @OAS3
+ ComponentRequestBodies,
+
+ @OAS3
+ ComponentHeaders,
+
+ @OAS3
+ ComponentSecuritySchemes,
+
+ @OAS3
+ ComponentLinks,
+
+ @OAS3
+ ComponentCallbacks,
+
+ @OAS3
+ ComponentPathItems,
+
+ /**
+ * Generated output includes documentation for all generated APIs.
+ */
+ @ToolingExtension
+ Api
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java
new file mode 100644
index 00000000000..e9b076bf4ee
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+
+/**
+ * Defines a set of globally available features. That is, support of these are defined at the top-level of the spec
+ */
+public enum GlobalFeature {
+ @OAS2 @OAS3
+ Info,
+
+ @OAS3
+ Servers,
+
+ @OAS2 @OAS3
+ Paths,
+
+ @OAS3
+ Webhooks,
+
+ @OAS3
+ Components,
+
+ @OAS2 @OAS3
+ Security,
+
+ @OAS2 @OAS3
+ Tags,
+
+ @OAS2 @OAS3
+ ExternalDocs,
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java
new file mode 100644
index 00000000000..7c6faf8beaa
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+
+/**
+ * Defines Operation features supported in the generated code.
+ */
+public enum OperationFeature {
+ @OAS3
+ Responses_HttpStatusCode,
+
+ @OAS3
+ Responses_RangedResponseCodes,
+
+ @OAS3
+ Responses_Default,
+
+ @OAS3
+ Responses_RedirectionResponse,
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java
new file mode 100644
index 00000000000..62b34c725da
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+
+/**
+ * Defines parameters supported by endpoints in the generated code.
+ */
+public enum ParameterFeature {
+ @OAS2 @OAS3
+ Name,
+
+ @OAS2 @OAS3
+ Required,
+
+ @OAS2 @OAS3
+ In_Path,
+
+ @OAS2 @OAS3
+ In_Query,
+
+ @OAS2 @OAS3
+ In_Header,
+
+ @OAS3
+ In_Cookie,
+
+ @OAS3
+ Style_Matrix,
+
+ @OAS3
+ Style_Label,
+
+ @OAS3
+ Style_Form,
+
+ @OAS3
+ Style_Simple,
+
+ @OAS3
+ Style_SpaceDelimited,
+
+ @OAS3
+ Style_PipeDelimited,
+
+ @OAS3
+ Style_DeepObject,
+
+ @OAS3
+ Explode,
+
+ @OAS3
+ Schema,
+
+ @OAS3
+ Content,
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java
new file mode 100644
index 00000000000..fc149c5574b
--- /dev/null
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * 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
+ *
+ * https://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.
+ */
+
+package org.openapijsonschematools.codegen.meta.features;
+
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+
+/**
+ * Defines special circumstances handled by the generator.
+ */
+public enum SchemaFeature {
+ @OAS2 @OAS3
+ AdditionalProperties,
+
+ /**
+ * The json schema Composition allOf keyword
+ * If a composed schema uses the allOf keyword, then payloads must be valid against all the given allOf schemas
+ */
+ @OAS2 @OAS3
+ AllOf,
+
+ /**
+ * The json schema Composition anyOf keyword
+ * If a composed schema uses the anyOf keyword, then payloads must be valid against any of the given anyOf schemas
+ */
+ @OAS3
+ AnyOf,
+
+ @OAS2 @OAS3
+ Default,
+
+ @OAS2 @OAS3
+ Discriminator,
+
+ @OAS2 @OAS3
+ Enum,
+
+ @OAS2 @OAS3
+ ExclusiveMinimum,
+
+ @OAS2 @OAS3
+ ExclusiveMaximum,
+
+ @OAS2 @OAS3
+ Format,
+
+ @OAS2 @OAS3
+ Items,
+
+ @OAS2 @OAS3
+ MaxItems,
+
+ @OAS2 @OAS3
+ MaxLength,
+
+ @OAS2 @OAS3
+ MaxProperties,
+
+ @OAS2 @OAS3
+ Maximum,
+
+ @OAS2 @OAS3
+ MinItems,
+
+ @OAS2 @OAS3
+ MinLength,
+
+ @OAS2 @OAS3
+ MinProperties,
+
+ @OAS2 @OAS3
+ Minimum,
+
+ @OAS2 @OAS3
+ MultipleOf,
+
+ @OAS3
+ Not,
+
+ @OAS3
+ Nullable,
+
+ @OAS3
+ OneOf,
+
+ @OAS2 @OAS3
+ Pattern,
+
+ @OAS2 @OAS3
+ Properties,
+
+ @OAS2 @OAS3
+ Required,
+
+ @OAS2 @OAS3
+ Type,
+
+ @OAS2 @OAS3
+ UniqueItems,
+
+ @OAS2 @OAS3
+ Xml
+}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/SecurityFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java
similarity index 87%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/SecurityFeature.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java
index 194141e8d33..a05b649ce96 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/SecurityFeature.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta.features;
+package org.openapijsonschematools.codegen.meta.features;
-import org.openapitools.codegen.meta.features.annotations.OAS2;
-import org.openapitools.codegen.meta.features.annotations.OAS3;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
/**
* Defines security features supported in the generated code.
@@ -27,7 +27,7 @@ public enum SecurityFeature {
* Supports header-based basic http auth.
*/
@OAS2 @OAS3
- BasicAuth,
+ HTTP_Basic,
/**
* Supports header-based api-key http auth.
@@ -44,8 +44,8 @@ public enum SecurityFeature {
/**
* Supports header-based bearer auth (e.g. header + bearer format).
*/
- @OAS3
- BearerToken,
+ @OAS2 @OAS3
+ HTTP_Bearer,
/**
* Supports authorization via OAuth2 implicit flow.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/WireFormatFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java
similarity index 79%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/WireFormatFeature.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java
index d7b888e12b6..86c5260a0ff 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/WireFormatFeature.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta.features;
+package org.openapijsonschematools.codegen.meta.features;
-import org.openapitools.codegen.meta.features.annotations.OAS2;
-import org.openapitools.codegen.meta.features.annotations.OAS3;
-import org.openapitools.codegen.meta.features.annotations.ToolingExtension;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS2;
+import org.openapijsonschematools.codegen.meta.features.annotations.OAS3;
+import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension;
/**
* Defines wire formats explicitly defined in spec or supported by the tool.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/AnnotationType.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java
similarity index 83%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/AnnotationType.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java
index 82e3886d6be..d3eb16ee21a 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/AnnotationType.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java
@@ -1,4 +1,4 @@
-package org.openapitools.codegen.meta.features.annotations;
+package org.openapijsonschematools.codegen.meta.features.annotations;
public enum AnnotationType {
OAS2, OAS3, ToolingExtension;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/OAS2.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java
similarity index 92%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/OAS2.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java
index 3926cfa7971..8ceb90178b4 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/OAS2.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta.features.annotations;
+package org.openapijsonschematools.codegen.meta.features.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/OAS3.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java
similarity index 92%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/OAS3.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java
index 75f5b2fc343..59f5acd410b 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/OAS3.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta.features.annotations;
+package org.openapijsonschematools.codegen.meta.features.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/ToolingExtension.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java
similarity index 92%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/ToolingExtension.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java
index 5751417bf01..9e7b8aba685 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/annotations/ToolingExtension.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.meta.features.annotations;
+package org.openapijsonschematools.codegen.meta.features.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/GenericValidator.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/GenericValidator.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java
index 00e4e00e463..64f922fc26e 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/GenericValidator.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
import java.util.List;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Invalid.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Invalid.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java
index 131e7a73465..f1469a03ba1 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Invalid.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
/**
* Represents a {@link Validated} state which is "Invalid" to some degree of {@link Severity}.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Severity.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java
similarity index 95%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Severity.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java
index e03d0f68c55..9be63d0f536 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Severity.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
/**
* Defines different levels of severity to be used during validation.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Valid.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java
similarity index 96%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Valid.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java
index 350f118ed0d..0803dcb62ac 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Valid.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
/**
* Represents a {@link Validated} state which is "valid" according to the defined rule.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Validated.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java
similarity index 98%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Validated.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java
index 05f9df833e4..d98f68d4611 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Validated.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
/**
* Provides details about the state of a completed validation.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/ValidationResult.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java
similarity index 98%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/ValidationResult.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java
index 628a11a225c..45b98a857bf 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/ValidationResult.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/ValidationRule.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java
similarity index 99%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/ValidationRule.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java
index c20773364b3..1cebb01ee30 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/ValidationRule.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
import java.util.function.Function;
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Validator.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java
similarity index 95%
rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Validator.java
rename to modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java
index fdf23fb3661..6dd15ec88dc 100644
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/validation/Validator.java
+++ b/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
/**
* Defines a contract allowing some input to be validated.
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/DataTypeFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/DataTypeFeature.java
deleted file mode 100644
index d684a6ce6df..00000000000
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/DataTypeFeature.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- *
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.meta.features;
-
-import org.openapitools.codegen.meta.features.annotations.OAS2;
-import org.openapitools.codegen.meta.features.annotations.OAS3;
-import org.openapitools.codegen.meta.features.annotations.ToolingExtension;
-
-/**
- * Defines common data types supported by a generator.
- * Some of these features are defined in specs, and some are specific to the tool.
- *
- * Where data types are listed as tool-specific, this either indicates that the data type is common enough that it is an officially
- * supported custom data type by the toolset (see {@link DataTypeFeature#Decimal}), or that the consideration of a special type isn't
- * explicitly mentioned by the specification(s) but differs enough across languages that it warrants a special callout (see {@link DataTypeFeature#ArrayOfModel}).
- */
-public enum DataTypeFeature {
- /**
- * Supports a generator-specific support usually via type=string's format property (e.g. email, uuid, etc), should be documented in generator README.
- *
- *
Loosely described in OpenAPI Specification(s). Generally means a custom "format" option applied to a string-typed property.
- * This should be used as an indicator for password best practices, such as assigning a variable to
- * a character array rather than string, avoiding logging the variable in clear text, and masking the value
- * in any user inputs. See OWASP for best practices.
- *
- * OAS 3.x does not have an explicit "file" type and instead relies on ContentType or response types.
- * That's not to say a generator doesn't support files, only that there's no direct
- * "file" type defined in the spec document.
- *
- *
- * NOTE: The default workflow may provide an "isFile" helper or synthesize the assumptions around files in the case of OAS 3.x.
- *
- */
- @OAS2
- File,
-
- /**
- * String uuid data
- */
- Uuid,
-
- /**
- * Supports arrays of data
- */
- @OAS2 @OAS3
- Array,
-
- /**
- * A JSON "null" value added in openapi v3.1.0
- */
- @OAS3
- Null,
-
- /**
- * When no type is defined, any data type is accepted
- */
- @OAS2 @OAS3
- AnyType,
-
- /**
- * An unordered set of properties mapping a string to an instance
- */
- @OAS2 @OAS3
- Object,
-
- /**
- * Supports map of data
- */
- @ToolingExtension
- Maps,
-
- /**
- * Supports specifying the format of the array if type array is used (one of: csv, ssv, tsv, pipes).
- *
- *
- * For multi support, check {@link DataTypeFeature#CollectionFormatMulti}. OAS 3.x removes collectionFormat in favor of Style properties.
- *
- * This is special cased because it is not as easily implemented as a delimiter as with CollectionFormat.
- * OAS 3.x removes collectionFormat for style properties.
- *
- */
- @OAS2
- CollectionFormatMulti,
-
- /**
- * Supports enum properties
- */
- @OAS2 @OAS3
- Enum,
-
- /**
- * Supports an array of enum
- */
- @ToolingExtension
- ArrayOfEnum,
-
- /**
- * Supports an array of models
- */
- @ToolingExtension
- ArrayOfModel,
-
- /**
- * Supports an array of arrays (primitives)
- */
- @ToolingExtension
- ArrayOfCollectionOfPrimitives,
-
- /**
- * Supports an array of arrays (models)
- */
- @ToolingExtension
- ArrayOfCollectionOfModel,
-
- /**
- * Supports an array of arrays (enums)
- */
- @ToolingExtension
- ArrayOfCollectionOfEnum,
-
- /**
- * Supports a map of enums
- */
- @ToolingExtension
- MapOfEnum,
-
- /**
- * Supports a map of models
- */
- @ToolingExtension
- MapOfModel,
-
- /**
- * Supports a map of arrays (primitives)
- */
- @ToolingExtension
- MapOfCollectionOfPrimitives,
-
- /**
- * Supports a map of arrays (models)
- */
- @ToolingExtension
- MapOfCollectionOfModel,
-
- /**
- * Supports a map of arrays (enums)
- */
- @ToolingExtension
- MapOfCollectionOfEnum,
-}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java
deleted file mode 100644
index dda611e4740..00000000000
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/DocumentationFeature.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- *
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.meta.features;
-
-import org.openapitools.codegen.meta.features.annotations.ToolingExtension;
-
-/**
- * Defines the documentation type available in generated output.
- */
-public enum DocumentationFeature {
- /**
- * Generated output includes a README.
- */
- @ToolingExtension
- Readme,
-
- /**
- * Generated output includes documentation for all generated models.
- */
- @ToolingExtension
- Model,
-
- /**
- * Generated output includes documentation for all generated APIs.
- */
- @ToolingExtension
- Api;
-}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/GlobalFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/GlobalFeature.java
deleted file mode 100644
index f8b2a6d0b6a..00000000000
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/GlobalFeature.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- *
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.meta.features;
-
-import org.openapitools.codegen.meta.features.annotations.OAS2;
-import org.openapitools.codegen.meta.features.annotations.OAS3;
-
-/**
- * Defines a set of globally available features. That is, support of these are often defined at the top-level of the spec, or
- * defines general support of a feature (e.g. Examples, XMLStructureDefinitions).
- */
-public enum GlobalFeature {
- /**
- * Supports specifying the host or ip of the target system. If not defined, this should fall back to the
- * host/ip (and optional port) of the server which delivered the spec document.
- */
- @OAS2 @OAS3
- Host,
-
- /**
- * Supports providing an API prefix, appended to the host.
- *
- *
OAS 3.x supports this indirectly via servers with template variables.
- */
- @OAS2 @OAS3
- BasePath,
-
- /**
- * Supports passing information about the target server to the client.
- *
- *
- * Information passed to generated code should be explicitly documented in a generator's README.
- *
- * If a generator only supports partial schemes, please choose the PartialSchemes option.
- *
- *
- *
OAS 3.x supports this indirectly via servers with template variables.
- */
- @OAS2 @OAS3
- Schemes,
-
- /**
- * Supports fewer than all schemes supported by OpenAPI Specification.
- *
- *
- * Support should be explicitly documented in a generator's README.
- *
- *
- *
OAS 3.x supports this indirectly via servers with template variables.
- */
- @OAS2 @OAS3
- PartialSchemes,
-
- /**
- * Supports a globally defined array of consumable MimeTypes.
- *
- *
Global support is undefined in OAS 3.x.
- */
- @OAS2
- Consumes,
-
- /**
- * Supports a globally defined array of produced MimeTypes.
- *
- *
Global support is undefined in OAS 3.x.
- */
- @OAS2
- Produces,
-
- /**
- * Exposes external documentation defined in the specification document to generated code.
- */
- @OAS2 @OAS3
- ExternalDocumentation,
-
- /**
- * Allows the ability to provide example input/output structures, usually in JSON format.
- */
- @OAS2 @OAS3
- Examples,
-
- /**
- * Differs from supporting the MimeType.XML feature, in that this option indicates whether XML structures can be defined by spec document and honored by the caller.
- */
- @OAS2 @OAS3
- XMLStructureDefinitions,
-
- /**
- * Supports targeting one or more servers.
- *
- *
- * That is, server is not hard-coded (although there may be a default).
- * This option is valid only for "servers" without open-ended values.
- *
- */
- @OAS3
- MultiServer,
-
- /**
- * Supports targeting one or more servers, PLUS the ability to provide values for templated server parts
- */
- @OAS3
- ParameterizedServer,
-
- /**
- * Supports OAS 3.x "style" for parameters.
- *
- *
- * NOTE: This option is more relevant for documentation generators which support HTML stylesheets, but may be used
- * to determine structural characteristics of a property (as with OAS 3.x lack of collectionFormat).
- *
- */
- @OAS3
- ParameterStyling,
-
- /**
- * Supports OAS 3.x callbacks.
- */
- @OAS3
- Callbacks,
-
- /**
- * Supports OAS 3.x link objects, but does *NOT* suggest generated clients auto-follow links.
- */
- @OAS3
- LinkObjects
-}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/ParameterFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/ParameterFeature.java
deleted file mode 100644
index 6c9a3d6b883..00000000000
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/ParameterFeature.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- *
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.meta.features;
-
-import org.openapitools.codegen.meta.features.annotations.OAS2;
-import org.openapitools.codegen.meta.features.annotations.OAS3;
-
-/**
- * Defines parameters supported by endpoints in the generated code.
- */
-public enum ParameterFeature {
- /**
- * Supports path parameters.
- */
- @OAS2 @OAS3
- Path,
-
- /**
- * Supports query parameters.
- */
- @OAS2 @OAS3
- Query,
-
- /**
- * Supports header parameters.
- */
- @OAS2 @OAS3
- Header,
-
- /**
- * Supports body parameters.
- *
- *
- * OAS 3.x specification supports this structurally rather than as an "in" parameter.
- *
- */
- @OAS2
- Body,
-
- /**
- * Supports form encoded parameters.
- *
- * OAS 3.x specification supports this structurally via content types rather than as an "in" parameter.
- */
- @OAS2
- FormUnencoded,
-
- /**
- * Supports multipart parameters.
- *
- *
OAS 3.x specification supports this structurally via content types rather than as an "in" parameter.
Not defined in OAS 2.0 and no tooling extensions currently supported for OAS 2.0 support.
- */
- @OAS3
- Cookie
-}
diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/SchemaSupportFeature.java b/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/SchemaSupportFeature.java
deleted file mode 100644
index 6f453d12e65..00000000000
--- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapitools/codegen/meta/features/SchemaSupportFeature.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
- *
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.meta.features;
-
-import org.openapitools.codegen.meta.features.annotations.OAS2;
-import org.openapitools.codegen.meta.features.annotations.OAS3;
-
-/**
- * Defines special circumstances handled by the generator.
- */
-public enum SchemaSupportFeature {
- /**
- * Support of simple schemas (those which define properties directly).
- */
- @OAS2 @OAS3
- Simple,
-
- /**
- * Support of complex schemas (those which refer to the properties of another model).
- *
- *
In OpenAPI Specification, this indicates support of AllOf/OneOf.
- */
- @OAS2 @OAS3
- Composite,
-
- /**
- * Support for polymorphic classes.
- *
- *
- * This suggests Composite support, but may not always be the case and is therefore separate.
- *
- *
- *
In OpenAPI Specification, this indicates support of AllOf with a discriminator property on the derived schema.
- */
- @OAS2 @OAS3
- Polymorphism,
-
- /**
- * Support for a union type.
- *
- *
- * This means that a single "Type" in generated code may refer to one of any type in a set of 2 or more types.
- *
- * This is defined as a union as "OneOf" support is not explicitly limited to physical boundaries in OpenAPI Specification. The
- * implementation of such a type is easily represented dynamically (a JSON object), but requires explicit language support and
- * potentially a custom implementation (typed instances).
- *
- * Note that a generator may support "Unions" very loosely by returning an Object/Any/ref/interface{} type, leaving onus
- * on type determination to the consumer. This does *NOT* suggest generated code implements a "Union Type".
- *
- *
- *
This suggests support of OneOf in OpenAPI Specification with a discriminator.
- */
- @OAS3
- Union,
-
- /**
- * The json schema Composition allOf keyword
- * If a composed schema uses the allOf keyword, then payloads must be valid against all the given allOf schemas
- */
- @OAS2 @OAS3
- allOf,
-
- /**
- * The json schema Composition anyOf keyword
- * If a composed schema uses the anyOf keyword, then payloads must be valid against any of the given anyOf schemas
- */
- @OAS3
- anyOf,
-
- /**
- * The json schema Composition oneOf keyword
- * If a composed schema uses the oneOf keyword, then payloads must be valid against one of the given oneOf schemas
- */
- @OAS3
- oneOf,
-
- /**
- * The json schema Composition not keyword
- * If a composed schema uses the not keyword, then payloads must not be valid against the given not schema
- */
- @OAS3
- not
-}
diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java
similarity index 98%
rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java
rename to modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java
index 33638f76735..f6bc0c685e6 100644
--- a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/config/WorkflowSettingsTest.java
+++ b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.config;
+package org.openapijsonschematools.codegen.config;
import org.testng.annotations.Test;
diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/meta/FeatureSetTest.java b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java
similarity index 75%
rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/meta/FeatureSetTest.java
rename to modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java
index 7378903d471..2c80f4e664b 100644
--- a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/meta/FeatureSetTest.java
+++ b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java
@@ -1,7 +1,13 @@
-package org.openapitools.codegen.meta;
-
-import org.openapitools.codegen.meta.features.*;
-import org.openapitools.codegen.meta.features.annotations.AnnotationType;
+package org.openapijsonschematools.codegen.meta;
+
+import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature;
+import org.openapijsonschematools.codegen.meta.features.DataTypeFeature;
+import org.openapijsonschematools.codegen.meta.features.DocumentationFeature;
+import org.openapijsonschematools.codegen.meta.features.GlobalFeature;
+import org.openapijsonschematools.codegen.meta.features.ParameterFeature;
+import org.openapijsonschematools.codegen.meta.features.SchemaFeature;
+import org.openapijsonschematools.codegen.meta.features.SecurityFeature;
+import org.openapijsonschematools.codegen.meta.features.annotations.AnnotationType;
import org.testng.annotations.Test;
import java.util.ArrayList;
@@ -34,11 +40,11 @@ public void flattenOnMultipleFeatures() {
FeatureSet featureSet = FeatureSet.newBuilder()
.includeClientModificationFeatures(ClientModificationFeature.BasePath)
.includeDataTypeFeatures(DataTypeFeature.Int32, DataTypeFeature.Array)
- .includeGlobalFeatures(GlobalFeature.Consumes, GlobalFeature.Examples)
- .includeParameterFeatures(ParameterFeature.Body, ParameterFeature.Query)
- .includeSecurityFeatures(SecurityFeature.BearerToken, SecurityFeature.BasicAuth, SecurityFeature.OAuth2_Implicit)
- .includeDocumentationFeatures(DocumentationFeature.Model)
- .includeSchemaSupportFeatures(SchemaSupportFeature.Composite)
+ .includeGlobalFeatures(GlobalFeature.Security, GlobalFeature.Info)
+ .includeParameterFeatures(ParameterFeature.In_Header, ParameterFeature.In_Query)
+ .includeSecurityFeatures(SecurityFeature.HTTP_Bearer, SecurityFeature.HTTP_Basic, SecurityFeature.OAuth2_Implicit)
+ .includeDocumentationFeatures(DocumentationFeature.ComponentSchemas)
+ .includeSchemaFeatures(SchemaFeature.OneOf)
.build();
List flattened = featureSet.flatten();
@@ -79,36 +85,36 @@ public void flattenOnMultipleFeatures() {
assertEquals(new HashSet<>(supported.get(2).source), bothSpecs);
assertEquals(supported.get(3).featureCategory, DocumentationFeature.class.getSimpleName());
- assertEquals(supported.get(3).featureName, DocumentationFeature.Model.name());
- assertEquals(new HashSet<>(supported.get(3).source), toolingOnly);
+ assertEquals(supported.get(3).featureName, DocumentationFeature.ComponentSchemas.name());
+ assertEquals(new HashSet<>(supported.get(3).source), oas3Only);
- assertEquals(supported.get(4).featureCategory, SchemaSupportFeature.class.getSimpleName());
- assertEquals(supported.get(4).featureName, SchemaSupportFeature.Composite.name());
- assertEquals(new HashSet<>(supported.get(4).source), bothSpecs);
+ assertEquals(supported.get(4).featureCategory, SchemaFeature.class.getSimpleName());
+ assertEquals(supported.get(4).featureName, SchemaFeature.OneOf.name());
+ assertEquals(new HashSet<>(supported.get(4).source), oas3Only);
assertEquals(supported.get(5).featureCategory, GlobalFeature.class.getSimpleName());
- assertEquals(supported.get(5).featureName, GlobalFeature.Consumes.name());
- assertEquals(new HashSet<>(supported.get(5).source), oas2Only);
+ assertEquals(supported.get(5).featureName, GlobalFeature.Info.name());
+ assertEquals(new HashSet<>(supported.get(5).source), bothSpecs);
assertEquals(supported.get(6).featureCategory, GlobalFeature.class.getSimpleName());
- assertEquals(supported.get(6).featureName, GlobalFeature.Examples.name());
+ assertEquals(supported.get(6).featureName, GlobalFeature.Security.name());
assertEquals(new HashSet<>(supported.get(6).source), bothSpecs);
assertEquals(supported.get(7).featureCategory, ParameterFeature.class.getSimpleName());
- assertEquals(supported.get(7).featureName, ParameterFeature.Query.name());
+ assertEquals(supported.get(7).featureName, ParameterFeature.In_Query.name());
assertEquals(new HashSet<>(supported.get(7).source), bothSpecs);
assertEquals(supported.get(8).featureCategory, ParameterFeature.class.getSimpleName());
- assertEquals(supported.get(8).featureName, ParameterFeature.Body.name());
- assertEquals(new HashSet<>(supported.get(8).source), oas2Only);
+ assertEquals(supported.get(8).featureName, ParameterFeature.In_Header.name());
+ assertEquals(new HashSet<>(supported.get(8).source), bothSpecs);
assertEquals(supported.get(9).featureCategory, SecurityFeature.class.getSimpleName());
- assertEquals(supported.get(9).featureName, SecurityFeature.BasicAuth.name());
+ assertEquals(supported.get(9).featureName, SecurityFeature.HTTP_Basic.name());
assertEquals(new HashSet<>(supported.get(9).source), bothSpecs);
assertEquals(supported.get(10).featureCategory, SecurityFeature.class.getSimpleName());
- assertEquals(supported.get(10).featureName, SecurityFeature.BearerToken.name());
- assertEquals(new HashSet<>(supported.get(10).source), oas3Only);
+ assertEquals(supported.get(10).featureName, SecurityFeature.HTTP_Bearer.name());
+ assertEquals(new HashSet<>(supported.get(10).source), bothSpecs);
assertEquals(supported.get(11).featureCategory, SecurityFeature.class.getSimpleName());
assertEquals(supported.get(11).featureName, SecurityFeature.OAuth2_Implicit.name());
diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/GenericValidatorTest.java b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java
similarity index 99%
rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/GenericValidatorTest.java
rename to modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java
index 3fa8874ff19..75120247608 100644
--- a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/GenericValidatorTest.java
+++ b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
import org.testng.annotations.Test;
diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/ValidatedTest.java b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java
similarity index 95%
rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/ValidatedTest.java
rename to modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java
index 44cf125f5c7..ddc780c3e2c 100644
--- a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/ValidatedTest.java
+++ b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
import org.testng.annotations.Test;
diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/ValidationRuleTest.java b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java
similarity index 97%
rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/ValidationRuleTest.java
rename to modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java
index f75389aafa5..d6149067cc0 100644
--- a/modules/openapi-json-schema-generator-core/src/test/java/org/openapitools/codegen/validation/ValidationRuleTest.java
+++ b/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.openapitools.codegen.validation;
+package org.openapijsonschematools.codegen.validation;
import org.testng.annotations.Test;
diff --git a/modules/openapi-json-schema-generator-online/.openapi-generator/VERSION b/modules/openapi-json-schema-generator-online/.openapi-generator/VERSION
deleted file mode 100644
index ad121e8340e..00000000000
--- a/modules/openapi-json-schema-generator-online/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3.0.1-SNAPSHOT
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator-online/Dockerfile b/modules/openapi-json-schema-generator-online/Dockerfile
deleted file mode 100644
index 6552a9175c7..00000000000
--- a/modules/openapi-json-schema-generator-online/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM openjdk:8-jre-alpine
-
-WORKDIR /generator
-
-COPY target/openapi-jsons-schema-generator-online.jar /generator/openapi-json-schema-generator-online.jar
-
-# GENERATOR_HOST can be used to determine the target location of a download link.
-# The default value assumes binding to host via: docker -p 8080:8080 image_name
-# Generally, this "just works" without GENERATOR_HOST, and this is provided only as
-# a workaround if all else fails.
-ENV GENERATOR_HOST=""
-
-EXPOSE 8080
-
-CMD ["java", "-jar", "/generator/openapi-json-schema-generator-online.jar" ]
diff --git a/modules/openapi-json-schema-generator-online/README.md b/modules/openapi-json-schema-generator-online/README.md
deleted file mode 100644
index 2c77fa3c69c..00000000000
--- a/modules/openapi-json-schema-generator-online/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# OpenAPI generated server
-
-A Spring Boot Server application which hosts a client/server generator API.
-
-
-## Overview
-
-This server was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.
-By using the [OpenAPI-Spec](https://openapis.org), you can easily generate a server stub or one of 100+ client packages.
-
-This is an example of building a OpenAPI-enabled server in Java using the SpringBoot framework.
-
-The underlying library integrating OpenAPI to SpringBoot is [springfox](https://github.com/springfox/springfox)
-
-## Building
-
-Refer to [root README](../../README.md) for build directions.
-
-## Running
-
-### Via command line
-
-Running is as simple as:
-
-```
-java -jar ./target/openapi-generator-online.jar
-```
-
-This exposes the API on local port 8080.
-
-Springfox supports configuration of the "host" value in the output OpenAPI document by setting the `Host` HTTP header in the request.
-To set this explicitly, pass the system property `springfox.documentation.swagger.v2.host` with the desired host. For example:
-
-```
-java -Dspringfox.documentation.swagger.v2.host=example.com:8888 -jar ./target/openapi-generator-online.jar
-```
-
-### Via Docker
-
-After building from source, change to this module directory (`cd modules/openapi-generator-online`) and build the docker image:
-
-```
-docker build -t openapitools/openapi-generator-online:latest .
-```
-
-Now, run the docker image:
-
-```
-docker run -d -p 8888:8080 openapitools/openapi-generator-online
-```
-
-The `GENERATOR_HOST` variable is used here to ensure download links generated by the API refer to the proper API location.
-
-## Environment
-
-`GENERATOR_HOST` can be set to force the scheme/host/port used for download link generation. In most cases, this environment variable is not
-necessary to be set and the download link will be generated to match the originating request. The variable is provided simply as a fallback.
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator-online/pom.xml b/modules/openapi-json-schema-generator-online/pom.xml
deleted file mode 100644
index 05ab87087bc..00000000000
--- a/modules/openapi-json-schema-generator-online/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
- 4.0.0
-
- org.openapitools
- openapi-json-schema-generator-project
- ${revision}
- ../..
-
- openapi-json-schema-generator-online
- jar
- openapi-json-schema-generator-online
-
- 2.5.5
- 3.0.0
- **/org/openapitools/codegen/online/**/*
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
-
-
- openapi-json-schema-generator-online
- src/main/java
-
-
- src/main/resources
- true
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- ${project.parent.basedir}${file.separator}google_checkstyle.xml
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- ${spring-boot.version}
-
-
-
- repackage
-
-
-
-
-
-
-
-
-
- static-analysis
-
-
-
- com.github.spotbugs
- spotbugs-maven-plugin
-
- ${project.parent.basedir}${file.separator}spotbugs-exclude.xml
-
-
-
- org.apache.maven.plugins
- maven-pmd-plugin
-
-
- se.bjurr.violations
- violations-maven-plugin
-
-
- 3
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
- io.springfox
- springfox-swagger2
- ${springfox-version}
-
-
- io.swagger
- swagger-annotations
-
-
- io.swagger
- swagger-models
-
-
- com.google.guava
- guava
-
-
-
-
-
-
- jakarta.validation
- jakarta.validation-api
-
-
- org.openapitools
- openapi-json-schema-generator
- ${project.parent.version}
-
-
-
- junit
- junit
- ${junit.version}
- test
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.boot
- spring-boot-test
- test
-
-
-
diff --git a/modules/openapi-json-schema-generator-online/sample.json b/modules/openapi-json-schema-generator-online/sample.json
deleted file mode 100644
index 22194e36a96..00000000000
--- a/modules/openapi-json-schema-generator-online/sample.json
+++ /dev/null
@@ -1,479 +0,0 @@
-{
- "opts": {},
- "spec": {
- "swagger": "2.0",
- "title": "Petstore Sample API",
- "info": {
- "description": "A sample API that uses a petstore as an example to demonstrate features in the OpenAPI-2.0 specification",
- "title": "Petstore Sample API",
- "contact": {
- "name": "Wordnik API Team"
- },
- "license": {
- "name": "MIT",
- "url": "http://github.com/gruntjs/grunt/blob/master/LICENSE-MIT"
- }
- },
- "host": "petstore.swagger.io",
- "basePath": "/api",
- "paths": {
- "/pet": {
- "put": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "description": "Pet object that needs to be added to the store",
- "required": false,
- "schema": {
- "$ref": "#/definitions/Pet"
- }
- }
- ],
- "responses": {
- "405": {
- "description": "Validation exception"
- },
- "404": {
- "description": "Pet not found"
- },
- "400": {
- "description": "Invalid ID supplied"
- }
- }
- },
- "post": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "description": "Pet object that needs to be added to the store",
- "required": false,
- "schema": {
- "$ref": "#/definitions/Tag"
- }
- }
- ],
- "responses": {
- "405": {
- "description": "Invalid input"
- }
- }
- }
- },
- "/user/createWithList": {
- "post": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "description": "List of user object",
- "required": false
- }
- ]
- }
- },
- "/store/order/{orderId}": {
- "get": {
- "tags": [
- "store"
- ],
- "parameters": [
- {
- "name": "orderId",
- "in": "path",
- "description": "ID of pet that needs to be fetched",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "404": {
- "description": "Order not found"
- },
- "400": {
- "description": "Invalid ID supplied"
- }
- }
- },
- "delete": {
- "tags": [
- "store"
- ],
- "parameters": [
- {
- "name": "orderId",
- "in": "path",
- "description": "ID of the order that needs to be deleted",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "404": {
- "description": "Order not found"
- },
- "400": {
- "description": "Invalid ID supplied"
- }
- }
- }
- },
- "/user/createWithArray": {
- "post": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "description": "List of user object",
- "required": false,
- "schema": {
- "$ref": "#/definitions/User"
- }
- }
- ]
- }
- },
- "/store/order": {
- "post": {
- "tags": [
- "store"
- ],
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "description": "order placed for purchasing the pet",
- "required": false,
- "schema": {
- "$ref": "#/definitions/Order"
- }
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid Order"
- }
- }
- }
- },
- "/pet/findByStatus": {
- "get": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "status",
- "in": "query",
- "description": "Status values that need to be considered for filter",
- "required": false,
- "type": "string"
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid status value"
- }
- }
- }
- },
- "/user/{username}": {
- "get": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "in": "path",
- "description": "The name that needs to be fetched. Use user1 for testing. ",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "404": {
- "description": "User not found"
- },
- "400": {
- "description": "Invalid username supplied"
- }
- }
- },
- "put": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "in": "path",
- "description": "name that need to be deleted",
- "required": true,
- "type": "string"
- },
- {
- "name": "body",
- "in": "body",
- "description": "Updated user object",
- "required": false,
- "schema": {
- "$ref": "#/definitions/User"
- }
- }
- ],
- "responses": {
- "404": {
- "description": "User not found"
- },
- "400": {
- "description": "Invalid user supplied"
- }
- }
- },
- "delete": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "in": "path",
- "description": "The name that needs to be deleted",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "404": {
- "description": "User not found"
- },
- "400": {
- "description": "Invalid username supplied"
- }
- }
- }
- },
- "/pet/findByTags": {
- "get": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "tags",
- "in": "query",
- "description": "Tags to filter by",
- "required": false,
- "type": "string"
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid tag value"
- }
- }
- }
- },
- "/user": {
- "post": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "body",
- "in": "body",
- "description": "Created user object",
- "required": false,
- "schema": {
- "$ref": "#/definitions/User"
- }
- }
- ]
- }
- },
- "/pet/{petId}": {
- "get": {
- "tags": [
- "pet"
- ],
- "parameters": [
- {
- "name": "petId",
- "in": "path",
- "description": "ID of pet that needs to be fetched",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "404": {
- "description": "Pet not found"
- },
- "400": {
- "description": "Invalid ID supplied"
- }
- }
- }
- },
- "/user/logout": {
- "get": {
- "tags": [
- "user"
- ]
- }
- },
- "/user/login": {
- "get": {
- "tags": [
- "user"
- ],
- "parameters": [
- {
- "name": "username",
- "in": "query",
- "description": "The user name for login",
- "required": false,
- "type": "string"
- },
- {
- "name": "password",
- "in": "query",
- "description": "The password for login in clear text",
- "required": false,
- "type": "string"
- }
- ],
- "responses": {
- "400": {
- "description": "Invalid username/password supplied"
- }
- }
- }
- }
- },
- "definitions": {
- "User": {
- "properties": {
- "id": {
- "type": "integer",
- "format": "int32"
- },
- "lastName": {
- "type": "string"
- },
- "username": {
- "type": "string"
- },
- "phone": {
- "type": "string"
- },
- "email": {
- "type": "string"
- },
- "userStatus": {
- "type": "integer",
- "format": "int32"
- },
- "firstName": {
- "type": "string"
- },
- "password": {
- "type": "string"
- }
- }
- },
- "Category": {
- "properties": {
- "id": {
- "type": "integer",
- "format": "int32"
- },
- "name": {
- "type": "string"
- }
- }
- },
- "Pet": {
- "properties": {
- "id": {
- "type": "integer",
- "format": "int32"
- },
- "tags": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/Tag"
- }
- },
- "category": {
- "$ref": "#/definitions/Category"
- },
- "status": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "photoUrls": {
- "type": "array",
- "items": {
- "type": "string"
- }
- }
- }
- },
- "Tag": {
- "properties": {
- "id": {
- "type": "integer",
- "format": "int32"
- },
- "name": {
- "type": "string"
- }
- }
- },
- "Order": {
- "properties": {
- "id": {
- "type": "integer",
- "format": "int32"
- },
- "petId": {
- "type": "integer",
- "format": "int32"
- },
- "status": {
- "type": "string"
- },
- "complete": {
- "type": "boolean"
- },
- "quantity": {
- "type": "integer",
- "format": "int32"
- },
- "shipDate": {
- "type": "string",
- "format": "date-time"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/OpenAPI2SpringBoot.java b/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/OpenAPI2SpringBoot.java
deleted file mode 100644
index c81012e09f6..00000000000
--- a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/OpenAPI2SpringBoot.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.online;
-
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.ExitCodeGenerator;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.web.filter.ForwardedHeaderFilter;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@SpringBootApplication
-@ComponentScan(basePackages = { "org.openapitools.codegen.online", "org.openapitools.codegen.online.api", "org.openapitools.codegen.online.configuration"})
-public class OpenAPI2SpringBoot implements CommandLineRunner {
-
- @Override
- public void run(String... arg0) {
- if (arg0.length > 0 && arg0[0].equals("exitcode")) {
- throw new ExitException();
- }
- }
-
- public static void main(String[] args) {
- new SpringApplication(OpenAPI2SpringBoot.class).run(args);
- }
-
- static class ExitException extends RuntimeException implements ExitCodeGenerator {
- private static final long serialVersionUID = 1L;
-
- @Override
- public int getExitCode() {
- return 10;
- }
-
- }
-
- @Bean
- public WebMvcConfigurer corsConfigurer() {
- return new WebMvcConfigurer() {
- @Override
- public void addCorsMappings(CorsRegistry registry) {
- registry.addMapping("/**").allowedOrigins("*").allowedHeaders("Content-Type");
- }
- };
- }
-
- @Bean
- ForwardedHeaderFilter forwardedHeaderFilter() {
- return new ForwardedHeaderFilter();
- }
-}
diff --git a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/RFC3339DateFormat.java b/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/RFC3339DateFormat.java
deleted file mode 100644
index fa2752bd6f8..00000000000
--- a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/RFC3339DateFormat.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.online;
-
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-
-import java.text.FieldPosition;
-import java.util.Date;
-
-
-public class RFC3339DateFormat extends ISO8601DateFormat {
-
- private static final long serialVersionUID = 1L;
-
- // Same as ISO8601DateFormat but serializing milliseconds.
- @Override
- public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
- String value = ISO8601Utils.format(date, true);
- toAppendTo.append(value);
- return toAppendTo;
- }
-
-}
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/ApiOriginFilter.java b/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/ApiOriginFilter.java
deleted file mode 100644
index fe721809dc3..00000000000
--- a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/ApiOriginFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.online.api;
-
-import java.io.IOException;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
-
-
-public class ApiOriginFilter implements javax.servlet.Filter {
- @Override
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- HttpServletResponse res = (HttpServletResponse) response;
- res.addHeader("Access-Control-Allow-Origin", "*");
- res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
- res.addHeader("Access-Control-Allow-Headers", "Content-Type");
- chain.doFilter(request, response);
- }
-
- @Override
- public void destroy() {
- }
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
-}
diff --git a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/ApiUtil.java b/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/ApiUtil.java
deleted file mode 100644
index f6b510480a2..00000000000
--- a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/ApiUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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
- *
- * https://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.
- */
-
-package org.openapitools.codegen.online.api;
-
-import org.springframework.web.context.request.NativeWebRequest;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public class ApiUtil {
- public static void setExampleResponse(NativeWebRequest req, String contentType, String example) {
- try {
- req.getNativeResponse(HttpServletResponse.class).addHeader("Content-Type", contentType);
- req.getNativeResponse(HttpServletResponse.class).getOutputStream().print(example);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/GenApi.java b/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/GenApi.java
deleted file mode 100644
index 220a2274459..00000000000
--- a/modules/openapi-json-schema-generator-online/src/main/java/org/openapitools/codegen/online/api/GenApi.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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
- *
- * https://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.
- */
-
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (3.0.0-SNAPSHOT).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.codegen.online.api;
-
-import io.swagger.annotations.*;
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.online.model.GeneratorInput;
-import org.openapitools.codegen.online.model.ResponseCode;
-import org.springframework.core.io.Resource;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
-
-@Api(value = "gen", description = "the gen API")
-public interface GenApi {
- GenApiDelegate getDelegate();
-
- @ApiOperation(value = "Gets languages supported by the client generator", nickname = "clientOptions", notes = "", response = String.class, responseContainer = "List", tags={ "clients", })
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "successful operation", response = String.class, responseContainer = "List") })
- @RequestMapping(value = "/gen/clients",
- method = RequestMethod.GET)
- default ResponseEntity> clientOptions() {
- return getDelegate().clientOptions();
- }
-
-
- @ApiOperation(value = "Downloads a pre-generated file", nickname = "downloadFile", notes = "A valid `fileId` is generated by the `/clients/{language}` or `/servers/{language}` POST operations. The fileId code can be used just once, after which a new `fileId` will need to be requested.", response = MultipartFile.class, tags={ "clients","servers", })
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "successful operation", response = MultipartFile.class) })
- @RequestMapping(value = "/gen/download/{fileId}",
- produces = { "application/octet-stream" },
- method = RequestMethod.GET)
- default ResponseEntity downloadFile(@ApiParam(value = "",required=true) @PathVariable("fileId") String fileId) {
- return getDelegate().downloadFile(fileId);
- }
-
-
- @ApiOperation(value = "Generates a client library", nickname = "generateClient", notes = "Accepts a `GeneratorInput` options map for spec location and generation options", response = ResponseCode.class, tags={ "clients", })
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "successful operation", response = ResponseCode.class) })
- @RequestMapping(value = "/gen/clients/{language}",
- method = RequestMethod.POST)
- default ResponseEntity generateClient(@ApiParam(value = "The target language for the client library",required=true) @PathVariable("language") String language,@ApiParam(value = "Configuration for building the client library" ,required=true ) @Valid @RequestBody GeneratorInput generatorInput) {
- return getDelegate().generateClient(language, generatorInput);
- }
-
-
- @ApiOperation(value = "Generates a server library", nickname = "generateServerForLanguage", notes = "Accepts a `GeneratorInput` options map for spec location and generation options.", response = ResponseCode.class, tags={ "servers", })
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "successful operation", response = ResponseCode.class) })
- @RequestMapping(value = "/gen/servers/{framework}",
- method = RequestMethod.POST)
- default ResponseEntity generateServerForLanguage(@ApiParam(value = "framework",required=true) @PathVariable("framework") String framework,@ApiParam(value = "parameters" ,required=true ) @Valid @RequestBody GeneratorInput generatorInput) {
- return getDelegate().generateServerForLanguage(framework, generatorInput);
- }
-
-
- @ApiOperation(value = "Returns options for a client library", nickname = "getClientOptions", notes = "", tags={ "clients", })
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "successful operation") })
- @RequestMapping(value = "/gen/clients/{language}",
- produces = { "application/json" },
- method = RequestMethod.GET)
- default ResponseEntity