Samples simplified (#194)

* Renames some folders, removes some test resources

* Converts missing v2 specs to v3 specs to fix 2 java tests

* Updates readme links

* Updates gitignore

* Fixes 2 java tests

* Fixes more java tests, removes more unused samples

* Fixes java test

Author: spacether

.circleci/parallel.sh

@@ -67,10 +67,10 @@ elif [ "$NODE_INDEX" = "4" ]; then
   echo "Running node $NODE_INDEX to test 'samples.circleci.node4' defined in pom.xml ..."
 
   #mvn --no-snapshot-updates --quiet verify -Psamples.circleci.node4 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
-  (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)
+  (cd samples/client/petstore/python && make test)
+  (cd samples/client/3_0_3_unit_test/python && make test)
+  (cd samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python && make test)
+  (cd samples/client/openapi_features/security/python && make test)
 
 else
   echo "Running node $NODE_INDEX"

.gitignore

@@ -46,119 +46,9 @@ test-output/
 nbactions.xml
 test-output/
 
-# scalatra
-samples/server-generator/scalatra/output
-samples/server-generator/scalatra/target
-samples/server-generator/scalatra/output/.history
-
-# nodejs
-**/node_modules
-samples/server-generator/node/output/node_modules
-samples/server/petstore/nodejs/node_modules
-samples/server/petstore/nodejs-server/node_modules
-
-# qt cpp
-samples/client/build
-samples/client/petstore/build
-samples/client/petstore/cpp-qt/PetStore/moc_*
-samples/client/petstore/cpp-qt/PetStore/*.o
-samples/client/petstore/cpp-qt/build-*
-samples/client/petstore/cpp-qt/build-*
-samples/client/petstore/cpp-qt/PetStore/PetStore
-samples/client/petstore/cpp-qt/PetStore/Makefile
-samples/client/petstore/cpp-qt/PetStore/PetStore.pro.user
-samples/client/petstore/cpp-qt/CMakeLists.txt.user
-
-# cpprestsdk
-samples/client/petstore/cpp-restsdk/CMakeCache.txt
-samples/client/petstore/cpp-restsdk/CMakeFiles/
-samples/client/petstore/cpp-restsdk/Makefile
-samples/client/petstore/cpp-restsdk/cmake_install.cmake
-
 #Java/Android
 **/.gradle
-samples/client/petstore/java/hello.txt
-samples/client/petstore/java/okhttp-gson/hello.txt
-samples/client/petstore/java/jersey1/hello.txt
-samples/client/petstore/java/jersey2-java8/hello.txt
-samples/client/petstore/java/jersey2/hello.txt
-samples/client/petstore/android/default/hello.txt
-samples/client/petstore/android/volley/.gradle/
-samples/client/petstore/android/volley/build/
-samples/client/petstore/java/jersey2/.gradle/
-samples/client/petstore/java/jersey2/build/
-samples/client/petstore/java/okhttp-gson/.gradle/
-samples/client/petstore/java/okhttp-gson/build/
-samples/client/petstore/java/feign/build/
-samples/client/petstore/java/feign10x/build/
-samples/client/petstore/java/feign/project/
-samples/client/petstore/java/feign10x/project/
-samples/client/petstore/java/retrofit/build/
-samples/client/petstore/java/retrofit2/build/
-samples/client/petstore/java/retrofit2/hello.txt
-samples/client/petstore/java/retrofit2rx/build/
-samples/client/petstore/java/default/build/
-samples/client/petstore/scala/build/
-samples/client/petstore/java/resttemplate/hello.txt
-samples/client/petstore/java/retrofit2/hello.txt
-samples/client/petstore/java/feign/hello.txt
-samples/client/petstore/java/jersey2-java6/project/
-samples/client/petstore/java/jersey2-java8/project/
-samples/client/petstore/java/jersey2/project/
-
-# Perl
-samples/client/petstore/perl/deep_module_test/
-
-# Objc
-samples/client/petstore/objc/default/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
-samples/client/petstore/objc/default/SwaggerClientTests/Build
-samples/client/petstore/objc/default/SwaggerClientTests/Pods
-samples/client/petstore/objc/default/SwaggerClientTests/SwaggerClient.xcworkspace
-samples/client/petstore/objc/default/SwaggerClientTests/Podfile.lock
-
-samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
-samples/client/petstore/objc/core-data/SwaggerClientTests/Build
-samples/client/petstore/objc/core-data/SwaggerClientTests/Pods
-samples/client/petstore/objc/core-data/SwaggerClientTests/SwaggerClient.xcworkspace
-samples/client/petstore/objc/core-data/SwaggerClientTests/Podfile.lock
 
-# Swift
-samples/client/petstore/swift/**/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
-samples/client/petstore/swift/**/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
-samples/client/petstore/swift/**/SwaggerClientTests/Pods/
-#samples/client/petstore/swift/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
-#samples/client/petstore/swift/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
-samples/client/petstore/swift/**/SwaggerClientTests/Podfile.lock
-# Swift3
-samples/client/petstore/swift3/**/SwaggerClientTests/SwaggerClient.xcodeproj/xcuserdata
-samples/client/petstore/swift3/**/SwaggerClientTests/SwaggerClient.xcworkspace/xcuserdata
-#samples/client/petstore/swift3/**/SwaggerClientTests/Pods/
-#samples/client/petstore/swift3/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcuserdata
-#samples/client/petstore/swift3/**/SwaggerClientTests/Pods/Pods.xcodeproj/xcshareddata/xcschemes
-samples/client/petstore/swift3/**/SwaggerClientTests/Podfile.lock
-
-# C#
-*.csproj.user
-samples/client/petstore/csharp/SwaggerClient/IO.Swagger.userprefs
-samples/client/petstore/csharp/SwaggerClientTest/obj
-samples/client/petstore/csharp/SwaggerClientTest/bin
-samples/client/petstore/csharp/SwaggerClientTest/packages
-samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/
-samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/
-samples/client/petstore/csharp/SwaggerClientTest/TestResult.xml
-samples/client/petstore/csharp/SwaggerClientTest/nuget.exe
-samples/client/petstore/csharp/SwaggerClientTest/testrunner/
-samples/client/petstore/csharp/SwaggerClient/.vs
-samples/client/petstore/csharp/SwaggerClient/nuget.exe
-samples/client/petstore/csharp/SwaggerClient/obj
-samples/client/petstore/csharp/SwaggerClient/bin
-samples/client/petstore/csharp/SwaggerClient/obj/Debug/
-samples/client/petstore/csharp/SwaggerClient/bin/Debug/
-samples/client/petstore/csharp/SwaggerClient/packages
-samples/client/petstore/csharp/SwaggerClient/TestResult.xml
-samples/client/petstore/csharp/SwaggerClientWithPropertyChanged/IO.Swagger.userprefs
-samples/client/petstore/csharp-refactor/OpenAPIClient/TestResult.xml
-samples/client/petstore/csharp-refactor/OpenAPIClient/nuget.exe
 
 # Python
 *.pyc
@@ -168,104 +58,3 @@ samples/client/petstore/python/swagger_client.egg-info/SOURCES.txt
 samples/client/petstore/python/.coverage
 samples/client/petstore/python/.projectile
 samples/client/petstore/python/.venv/
-samples/client/petstore/python-asyncio/.venv/
-samples/client/petstore/python-asyncio/.pytest_cache/
-samples/client/petstore/python-tornado/.venv/
-
-# PHP
-samples/client/petstore/php/OpenAPIClient-php/composer.lock
-samples/client/petstore/php-dt/composer.lock
-samples/client/petstore/php-dt-modern/composer.lock
-samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
-samples/server/petstore/php-laravel/lib/composer.lock
-samples/server/petstore/php-lumen/lib/composer.lock
-samples/server/petstore/php-slim4/composer.lock
-samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
-samples/server/petstore/php-mezzio-ph/composer.lock
-samples/server/petstore/php-mezzio-ph-modern/composer.lock
-
-# ts
-samples/client/petstore/typescript-angular2/npm/npm-debug.log
-samples/client/petstore/typescript-node/npm/npm-debug.log
-samples/client/petstore/typescript-angular/tsd-debug.log
-samples/client/petstore/typescript-axios/tests/**/dist/
-samples/client/petstore/typescript-fetch/tests/**/dist/
-
-# aspnetcore
-samples/server/petstore/aspnetcore/.vs/
-effective.pom
-
-# kotlin
-samples/openapi3/client/petstore/kotlin/build
-samples/server/petstore/kotlin-server/ktor/build
-samples/server/petstore/kotlin-springboot/build
-samples/client/petstore/kotlin*/src/main/kotlin/test/
-samples/client/petstore/kotlin*/build/
-
-# haskell
-.stack-work
-.cabal-sandbox
-cabal.project.local
-samples/client/petstore/haskell-http-client/docs/haddock-bundle.min.js
-samples/client/petstore/haskell-http-client/docs/meta.json
-samples/client/petstore/haskell-http-client/docs/quick-jump.css
-samples/client/petstore/haskell-http-client/stack.yaml.lock
-samples/server/petstore/haskell-servant/stack.yaml.lock
-samples/server/petstore/haskell-yesod/stack.yaml.lock
-
-# R
-.Rproj.user
-samples/client/petstore/R/**/petstore.Rcheck/
-samples/client/petstore/R/**/*.tar.gz
-samples/client/petstore/R/R.Rproj
-samples/client/petstore/R/man/
-samples/client/petstore/R-httr2-wrapper/man/
-samples/client/petstore/R-httr2/man/
-
-# elixir
-samples/client/petstore/elixir/_build/
-samples/client/petstore/elixir/deps/
-samples/client/petstore/elixir/mix.lock
-
-# groovy
-samples/client/petstore/groovy/build
-
-# erlang
-samples/client/petstore/erlang-client/_build/
-samples/client/petstore/erlang-client/rebar.lock
-samples/client/petstore/erlang-proper/_build/
-samples/client/petstore/erlang-proper/rebar.lock
-samples/server/petstore/erlang-server/_build/
-samples/server/petstore/erlang-server/rebar.lock
-
-# Dart
-**/dart*/**/.dart_tool
-**/dart*/**/.packages
-**/dart*/**/pubspec.lock
-# Dart dio
-**/dart*/**/*.g.dart
-
-# JS
-samples/client/petstore/javascript-es6/package-lock.json
-samples/client/petstore/javascript-promise-es6/package-lock.json
-samples/client/petstore/javascript-apollo/package-lock.json
-
-# elm
-samples/client/petstore/elm/index.html
-
-# C
-samples/client/petstore/c/build
-samples/client/petstore/c/*.so
-
-# Ruby
-samples/openapi3/client/petstore/ruby/Gemfile.lock
-samples/openapi3/client/petstore/ruby-faraday/Gemfile.lock
-
-# Crystal
-samples/client/petstore/crystal/lib
-
-# Go
-samples/openapi3/client/petstore/go/privatekey.pem
-
-## OCaml
-samples/client/petstore/ocaml/_build/

README.md

@@ -23,9 +23,9 @@ You can join us here: https://discord.gg/mHB8WEQuYQ
 
 ## Reasons To Use the Python Generator
 
-- [Autogenerated thorough testing of json schema keyword features in models and endpoints](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/openapi3/client/3_0_3_unit_test/python/test) which come from the [json schema test suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite) 
+- [Autogenerated thorough testing of json schema keyword features in models and endpoints](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/client/3_0_3_unit_test/python/test) which come from the [json schema test suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite) 
 - [Tests are passing in CI](https://app.circleci.com/pipelines/github/openapi-json-schema-tools/openapi-json-schema-generator?branch=master)
-- [Test endpoints are tagged by the relevant keyword like type/format/allOf 25+ keywords and counting](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/openapi3/client/3_0_3_unit_test/python/docs/apis/tags)
+- [Test endpoints are tagged by the relevant keyword like type/format/allOf 25+ keywords and counting](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/client/3_0_3_unit_test/python/docs/apis/tags)
 - Run time type checking and validation checking when:
   - instantiating models
   - sending to endpoints
@@ -52,10 +52,10 @@ You can join us here: https://discord.gg/mHB8WEQuYQ
 
 And many more!
 - [Docs for the python generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/docs/generators/python.md)
-- [Openapi json schema v3.0.3 unit test spec](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml)
-  - [generated client sample code](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/openapi3/client/3_0_3_unit_test/python)
 - [Openapi v3.0.3 general petstore spec, general features](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/src/test/resources/3_0/python/petstore_customized.yaml)
-  - [generated client sample code](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/openapi3/client/petstore/python)
+  - [generated client sample code](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/client/petstore/python)
+- [Openapi json schema v3.0.3 unit test spec](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml)
+  - [generated client sample code](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/tree/master/samples/client/3_0_3_unit_test/python)
 
 ### Can I build here?
 
@@ -223,7 +223,7 @@ java -jar target/openapi-json-schema-generator-cli.jar generate \
   -g python \
   -t src/main/resources/python \
   --additional-properties packageName=petstore_api \
-  -o samples/openapi3/client/petstore/python
+  -o samples/client/petstore/python
 ```
 
 with a number of options. [The python options are documented here.](docs/generators/python.md)