Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit 062b4d2

Browse files
committed
Merge branch 'master' into cleanup-template-management
* master: [kotlin][client] add support for coroutines with OkHttp (OpenAPITools#6362) update package-json.lock (OpenAPITools#6430) fix hardcoded match type (OpenAPITools#6431) java jersey2 enhance anyOf (OpenAPITools#6420) [Java][jersey2] minor improvement to jersey2 tests (OpenAPITools#6418) ps minor style change (OpenAPITools#6424) [JS] mark ES5 as deprecated (OpenAPITools#6408) [ci] Execute maven and verify with no-snapshot-updates (OpenAPITools#6415) add new file in ts axios samples Migrate all scala generators to use OAS3 (OpenAPITools#6407) migrate ruby samples to oas3 (OpenAPITools#6414) [PS] check if JSON properties is defined (OpenAPITools#6419) Add C++ UE4 client generator (OpenAPITools#6399) Add a link to the article in dev.to (OpenAPITools#6421) typescript-axios anytype is not defined (OpenAPITools#6335) [Java][jersey2] Make (de)serialization work for oneOf models, add convenience and comparison methods (OpenAPITools#6323) Migrate OCaml petstore to use OAS v3 spec (OpenAPITools#6348) [Python-experimental] Fix type error if oneof/anyof child schema is null type (OpenAPITools#6387) [Python-server] Fix blueplanet 'file not found' error (OpenAPITools#6411) [nodejs] Fix deprecation notice when running sample nodejs script (OpenAPITools#6412)
2 parents e934bec + fac233b commit 062b4d2

File tree

2,180 files changed

+23479
-166304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,180 files changed

+23479
-166304
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ script:
135135
- /bin/bash ./bin/utils/detect_tab_in_java_class.sh
136136
# run integration tests defined in maven pom.xml
137137
# WARN: Travis will timeout after 10 minutes of no stdout/stderr activity, which is problematic with mvn --quiet.
138-
- mvn --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
139-
- mvn --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
138+
- mvn --no-snapshot-updates --quiet --batch-mode --show-version clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
139+
- mvn --no-snapshot-updates --quiet --batch-mode --show-version verify -Psamples -Dorg.slf4j.simpleLogger.defaultLogLevel=error
140140
# test maven plugin
141-
- mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
142-
- mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
143-
- mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
144-
- mvn --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
141+
- mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
142+
- mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
143+
- mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
144+
- mvn --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
145145
# test gradle plugin
146146
- (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk)
147147
- (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)

CI/.travis.yml.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ script:
3434
- set -e
3535
# run integration tests defined in maven pom.xml
3636
- cp pom.xml.bash pom.xml
37-
- mvn --batch-mode verify -Psamples
37+
- mvn --no-snapshot-updates --batch-mode verify -Psamples

CI/.travis.yml.ios

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ before_install:
3434

3535
script:
3636
# run integration tests defined in maven pom.xml
37-
- mvn -q --batch-mode verify -Psamples.ios -Dmaven.javadoc.skip=true
37+
- mvn --no-snapshot-updates -q --batch-mode verify -Psamples.ios -Dmaven.javadoc.skip=true

CI/bitrise.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ workflows:
2828
2929
set -e
3030
31-
mvn package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
31+
mvn --no-snapshot-updates package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
3232
title: Build openapi-generator
3333
3434
title: Update Swift samples

CI/circle_parallel.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ if [ "$NODE_INDEX" = "1" ]; then
2424
export PATH="/usr/local/go1.14/go/bin:$PATH"
2525
go version
2626

27-
mvn --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
28-
mvn --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
27+
mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
28+
mvn --no-snapshot-updates --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
2929

3030
elif [ "$NODE_INDEX" = "2" ]; then
3131
# run ensure-up-to-date sample script on SNAPSHOT version only
@@ -58,7 +58,7 @@ elif [ "$NODE_INDEX" = "2" ]; then
5858
sudo apt-get -y install libcurl4-gnutls-dev
5959

6060
# run integration tests
61-
mvn --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
61+
mvn --no-snapshot-updates --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
6262
else
6363
echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..."
6464
sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
@@ -73,7 +73,7 @@ else
7373
sudo apt-get install dart
7474
export PATH="$PATH:/usr/lib/dart/bin"
7575

76-
mvn --quiet verify -Psamples.circleci.jdk7 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
76+
mvn --no-snapshot-updates --quiet verify -Psamples.circleci.jdk7 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
7777
fi
7878

7979

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
749749
- 2020-05-09 - [OpenAPIでお手軽にモックAPIサーバーを動かす](https://qiita.com/kasa_le/items/97ca6a8dd4605695c25c) by [Sachie Kamba](https://qiita.com/kasa_le)
750750
- 2020-05-18 - [Spring Boot REST with OpenAPI 3](https://dev.to/alfonzjanfrithz/spring-boot-rest-with-openapi-3-59jm) by [Alfonz Jan Frithz](https://dev.to/alfonzjanfrithz)
751751
- 2020-05-19 - [Dead Simple APIs with Open API](https://www.youtube.com/watch?v=sIaXmR6xRAw) by [Chris Tankersley](https://github.com/dragonmantank) at [Nexmo](https://developer.nexmo.com/)
752+
- 2020-05-22 - [TypeScript REST API Client](https://dev.to/unhurried/typescript-rest-api-client-4in3) by ["unhurried"](https://dev.to/unhurried)
752753

753754
## [6 - About Us](#table-of-contents)
754755

@@ -778,6 +779,7 @@ Here is a list of template creators:
778779
* Bash: @bkryza
779780
* C: @PowerOfCreation @zhemant [:heart:](https://www.patreon.com/zhemant)
780781
* C++ REST: @Danielku15
782+
* C++ UE4: @Kahncode
781783
* C# (.NET 2.0): @who
782784
* C# (.NET Standard 1.3 ): @Gronsak
783785
* C# (.NET 4.5 refactored): @jimschubert [:heart:](https://www.patreon.com/jimschubert)

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ build_script:
4848
- nuget restore samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln
4949
- msbuild samples\client\petstore\csharp\OpenAPIClientNetStandard\Org.OpenAPITools.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
5050
# install openapi-generator locally
51-
- mvn clean install --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error
51+
- mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
5252
# run the locally installed openapi-generator-gradle-plugin
5353
- gradle -b modules\openapi-generator-gradle-plugin\samples\local-spec\build.gradle buildGoSdk --stacktrace
5454
test_script:

bin/cpp-ue4-petstore.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29+
ags="$@ generate -t modules/openapi-generator/src/main/resources/cpp-ue4 -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-ue4 -o samples/client/petstore/cpp-ue4"
30+
31+
java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-all.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
./bin/java-petstore-feign.sh
66
./bin/java-petstore-google-api-client.sh
77
./bin/java-petstore-jersey1.sh
8-
./bin/java-petstore-jersey2-java6.sh
9-
./bin/java-petstore-jersey2-java7.sh
108
./bin/java-petstore-jersey2-java8.sh
119
./bin/java-petstore-microprofile.sh
1210
./bin/java-petstore-native.sh

bin/java-petstore-jersey2-java6.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)