Skip to content

Commit a020170

Browse files
wing328wing328
authored
[java][client] Fix config, add more samples for testing (OpenAPITools#13912)
* fix config, add more samples for testing * update samples
1 parent 5221682 commit a020170

File tree

193 files changed

+31883
-2
lines changed

Some content is hidden

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

193 files changed

+31883
-2
lines changed

‎.github/workflows/samples-java-client-jdk11.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
- samples/client/petstore/jaxrs-cxf-client/**
88
- samples/client/petstore/java-micronaut-client/**
99
- samples/openapi3/client/petstore/java/jersey2-java8-special-characters/**
10+
- samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
1011
- samples/openapi3/client/petstore/java/native/**
1112
pull_request:
1213
paths:
1314
- 'samples/client/petstore/java/**'
1415
- samples/client/petstore/jaxrs-cxf-client/**
1516
- samples/client/petstore/java-micronaut-client/**
1617
- samples/openapi3/client/petstore/java/jersey2-java8-special-characters/**
18+
- samples/openapi3/client/petstore/java/jersey2-java8-swagger1/**
1719
- samples/openapi3/client/petstore/java/native/**
1820
jobs:
1921
build:
@@ -48,6 +50,9 @@ jobs:
4850
- samples/client/petstore/java/jersey1
4951
- samples/openapi3/client/petstore/java/jersey2-java8-special-characters
5052
- samples/openapi3/client/petstore/java/native
53+
- samples/client/petstore/java/okhttp-gson-swagger1/
54+
- samples/client/petstore/java/resttemplate-swagger1/
55+
- samples/openapi3/client/petstore/java/jersey2-java8-swagger1/
5156
steps:
5257
- uses: actions/checkout@v3
5358
- uses: actions/setup-java@v3

‎bin/configs/java-jersey2-8-swagger1.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
generatorName: java
2+
outputDir: samples/openapi3/client/petstore/java/jersey2-java8-swagger1
3+
library: jersey2
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
artifactId: petstore-openapi3-jersey2-java8
8+
hideGenerationTimestamp: true
9+
serverPort: "8082"
10+
dateLibrary: java8
11+
useOneOfDiscriminatorLookup: true
12+
disallowAdditionalPropertiesIfNotPresent: false
13+
gradleProperties: "\n# JVM arguments\norg.gradle.jvmargs=-Xmx2024m -XX:MaxPermSize=512m\n# set timeout\norg.gradle.daemon.idletimeout=3600000\n# show all warnings\norg.gradle.warning.mode=all"
14+
annotationLibrary: "swagger1"

‎bin/configs/java-okhttp-gson-swagger1.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/okhttp-gson-swagger1
3+
library: okhttp-gson
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
artifactId: petstore-okhttp-gson
8+
hideGenerationTimestamp: "true"
9+
useOneOfDiscriminatorLookup: "true"
10+
disallowAdditionalPropertiesIfNotPresent: false
11+
annotationLibrary: "swagger1"
12+

‎bin/configs/java-resttemplate-swagger1.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
generatorName: java
2-
outputDir: samples/client/petstore/java/resttemplate
2+
outputDir: samples/client/petstore/java/resttemplate-swagger1
33
library: resttemplate
4-
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/Java
66
additionalProperties:
77
artifactId: petstore-resttemplate

‎samples/client/petstore/java/okhttp-gson-swagger1/.github/workflows/maven.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
#
4+
# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
5+
6+
name: Java CI with Maven
7+
8+
on:
9+
push:
10+
branches: [ main, master ]
11+
pull_request:
12+
branches: [ main, master ]
13+
14+
jobs:
15+
build:
16+
name: Build OpenAPI Petstore
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
java: [ '8' ]
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Set up JDK
24+
uses: actions/setup-java@v2
25+
with:
26+
java-version: ${{ matrix.java }}
27+
distribution: 'temurin'
28+
cache: maven
29+
- name: Build with Maven
30+
run: mvn -B package --no-transfer-progress --file pom.xml

‎samples/client/petstore/java/okhttp-gson-swagger1/.gitignore

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
*.class
2+
3+
# Mobile Tools for Java (J2ME)
4+
.mtj.tmp/
5+
6+
# Package Files #
7+
*.jar
8+
*.war
9+
*.ear
10+
11+
# exclude jar for gradle wrapper
12+
!gradle/wrapper/*.jar
13+
14+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
15+
hs_err_pid*
16+
17+
# build files
18+
**/target
19+
target
20+
.gradle
21+
build

‎samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator-ignore

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# OpenAPI Generator Ignore
2+
# Generated by openapi-generator https://github.com/openapitools/openapi-generator
3+
4+
# Use this file to prevent files from being overwritten by the generator.
5+
# The patterns follow closely to .gitignore or .dockerignore.
6+
7+
# As an example, the C# client generator defines ApiClient.cs.
8+
# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
9+
#ApiClient.cs
10+
11+
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
12+
#foo/*/qux
13+
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
14+
15+
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
16+
#foo/**/qux
17+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
18+
19+
# You can also negate patterns with an exclamation (!).
20+
# For example, you can ignore all files in a docs folder with the file extension .md:
21+
#docs/*.md
22+
# Then explicitly reverse the ignore rule for a single file:
23+
#!docs/README.md

‎samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/FILES

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
.github/workflows/maven.yml
2+
.gitignore
3+
.travis.yml
4+
README.md
5+
api/openapi.yaml
6+
build.gradle
7+
build.sbt
8+
docs/Category.md
9+
docs/ModelApiResponse.md
10+
docs/Order.md
11+
docs/Pet.md
12+
docs/PetApi.md
13+
docs/StoreApi.md
14+
docs/Tag.md
15+
docs/User.md
16+
docs/UserApi.md
17+
git_push.sh
18+
gradle.properties
19+
gradle/wrapper/gradle-wrapper.jar
20+
gradle/wrapper/gradle-wrapper.properties
21+
gradlew
22+
gradlew.bat
23+
pom.xml
24+
settings.gradle
25+
src/main/AndroidManifest.xml
26+
src/main/java/org/openapitools/client/ApiCallback.java
27+
src/main/java/org/openapitools/client/ApiClient.java
28+
src/main/java/org/openapitools/client/ApiException.java
29+
src/main/java/org/openapitools/client/ApiResponse.java
30+
src/main/java/org/openapitools/client/Configuration.java
31+
src/main/java/org/openapitools/client/GzipRequestInterceptor.java
32+
src/main/java/org/openapitools/client/JSON.java
33+
src/main/java/org/openapitools/client/Pair.java
34+
src/main/java/org/openapitools/client/ProgressRequestBody.java
35+
src/main/java/org/openapitools/client/ProgressResponseBody.java
36+
src/main/java/org/openapitools/client/ServerConfiguration.java
37+
src/main/java/org/openapitools/client/ServerVariable.java
38+
src/main/java/org/openapitools/client/StringUtil.java
39+
src/main/java/org/openapitools/client/api/PetApi.java
40+
src/main/java/org/openapitools/client/api/StoreApi.java
41+
src/main/java/org/openapitools/client/api/UserApi.java
42+
src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
43+
src/main/java/org/openapitools/client/auth/Authentication.java
44+
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
45+
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
46+
src/main/java/org/openapitools/client/auth/OAuth.java
47+
src/main/java/org/openapitools/client/auth/OAuthFlow.java
48+
src/main/java/org/openapitools/client/auth/OAuthOkHttpClient.java
49+
src/main/java/org/openapitools/client/auth/RetryingOAuth.java
50+
src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
51+
src/main/java/org/openapitools/client/model/Category.java
52+
src/main/java/org/openapitools/client/model/ModelApiResponse.java
53+
src/main/java/org/openapitools/client/model/Order.java
54+
src/main/java/org/openapitools/client/model/Pet.java
55+
src/main/java/org/openapitools/client/model/Tag.java
56+
src/main/java/org/openapitools/client/model/User.java

‎samples/client/petstore/java/okhttp-gson-swagger1/.openapi-generator/VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.3.0-SNAPSHOT

‎samples/client/petstore/java/okhttp-gson-swagger1/.travis.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#
2+
# Generated by OpenAPI Generator: https://openapi-generator.tech
3+
#
4+
# Ref: https://docs.travis-ci.com/user/languages/java/
5+
#
6+
language: java
7+
jdk:
8+
- openjdk12
9+
- openjdk11
10+
- openjdk10
11+
- openjdk9
12+
- openjdk8
13+
before_install:
14+
# ensure gradlew has proper permission
15+
- chmod a+x ./gradlew
16+
script:
17+
# test using maven
18+
#- mvn test
19+
# test using gradle
20+
- gradle test
21+
# test using sbt
22+
# - sbt test

0 commit comments

Comments
 (0)