Skip to content

Commit 94117ba

Browse files
committed
Merge branch 'master' into PR OpenAPITools#24098 (relax strict typing for FastAPI path/query/header params)
Resolve conflicts in AbstractPythonCodegen.java: upstream moved constraint handling into a static ConstraintApplier / ConstraintType, replacing the per-type constants and the instance applyConstraints method. Reapply the PR's PydanticCoercibleType subclass on top of that refactor so path/query/ header parameters emit coercible (non-strict) Pydantic types, using the new ConstraintApplier API.
2 parents 4decf3c + f861dff commit 94117ba

5,677 files changed

Lines changed: 248416 additions & 80982 deletions

File tree

Some content is hidden

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

.github/workflows/docker-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
# build the JARs
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v7
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 11
@@ -21,7 +21,7 @@ jobs:
2121
java-version: 11
2222
distribution: 'zulu'
2323
- name: Cache Maven packages
24-
uses: actions/cache@v5
24+
uses: actions/cache@v6
2525
with:
2626
path: ~/.m2
2727
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Check out code
29-
uses: actions/checkout@v5
29+
uses: actions/checkout@v7
3030

3131
- name: Test run-in-docker.sh
3232
shell: bash

.github/workflows/gradle-plugin-tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
name: Gradle plugin tests
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v7
1717
- name: Set up JDK 21
1818
uses: actions/setup-java@v5
1919
with:
2020
java-version: 21
2121
distribution: 'temurin'
2222
cache: gradle
2323
- name: Cache maven dependencies
24-
uses: actions/cache@v5
24+
uses: actions/cache@v6
2525
env:
2626
cache-name: cache-maven-repository
2727
with:
@@ -40,7 +40,7 @@ jobs:
4040
./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4141
- name: Run tests with wrapper
4242
env:
43-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
43+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4444
run: |
4545
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
4646
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
@@ -51,6 +51,6 @@ jobs:
5151
gradle-version: '8.14.3'
5252
- name: Run tests without wrapper
5353
env:
54-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
54+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5555
run: |
5656
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && gradle buildJavaResttemplateSdk) # not using gradle wrapper

.github/workflows/gradle-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ jobs:
3232
- samples/client/petstore/java/native
3333
- samples/client/petstore/java/native-jakarta
3434
steps:
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v7
3636
- uses: actions/setup-java@v5
3737
with:
3838
distribution: 'temurin'
3939
java-version: 11
4040
cache: gradle
4141
# Cache Gradle Dependencies
4242
- name: Setup Gradle Dependencies Cache
43-
uses: actions/cache@v5
43+
uses: actions/cache@v6
4444
with:
4545
path: ~/.gradle/caches
4646
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
4747

4848
# Cache Gradle Wrapper
4949
- name: Setup Gradle Wrapper Cache
50-
uses: actions/cache@v5
50+
uses: actions/cache@v6
5151
with:
5252
path: ~/.gradle/wrapper
5353
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
os: [ubuntu-latest]
2121
steps:
2222
- name: Check out code
23-
uses: actions/checkout@v5
23+
uses: actions/checkout@v7
2424

2525
- name: Set up JDK ${{ matrix.java }}
2626
uses: actions/setup-java@v5
@@ -29,14 +29,14 @@ jobs:
2929
java-version: ${{ matrix.java }}
3030
cache: gradle
3131

32-
- uses: actions/cache@v5
32+
- uses: actions/cache@v6
3333
with:
3434
path: ~/.m2/repository
3535
key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
3636
restore-keys: |
3737
${{ runner.os }}-maven-
3838
39-
- uses: actions/cache@v5
39+
- uses: actions/cache@v6
4040
with:
4141
path: |
4242
~/.gradle/caches
@@ -60,7 +60,7 @@ jobs:
6060
shell: bash
6161
run: ./mvnw clean -nsu -B --quiet -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml
6262
env:
63-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
63+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6464

6565
- name: Upload Maven build artifact
6666
uses: actions/upload-artifact@v7
@@ -77,7 +77,7 @@ jobs:
7777
if: matrix.java == '11'
7878
shell: bash
7979
env:
80-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
80+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
8181
run: |
8282
cd modules/openapi-generator-maven-plugin
8383
mvn clean verify -Pintegration
@@ -91,7 +91,7 @@ jobs:
9191
os: [ubuntu-latest]
9292
steps:
9393
- name: Check out code
94-
uses: actions/checkout@v5
94+
uses: actions/checkout@v7
9595
- name: Setup Maven
9696
uses: s4u/setup-maven-action@v1.20.0
9797
with:

.github/workflows/maven-plugin-tests-jdk17.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
name: Maven plugin tests
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v7
1717
- name: Set up JDK 17
1818
uses: actions/setup-java@v5
1919
with:
2020
java-version: 17
2121
distribution: 'temurin'
2222
- name: Cache maven dependencies
23-
uses: actions/cache@v5
23+
uses: actions/cache@v6
2424
env:
2525
cache-name: cache-maven-repository
2626
with:
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-test-maven-plugin-
3636
- name: Run tests
3737
env:
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3939
run: |
4040
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

.github/workflows/maven-plugin-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
name: Maven plugin tests
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v7
1717
- name: Set up JDK 11
1818
uses: actions/setup-java@v5
1919
with:
2020
java-version: 11
2121
distribution: 'temurin'
2222
- name: Cache maven dependencies
23-
uses: actions/cache@v5
23+
uses: actions/cache@v6
2424
env:
2525
cache-name: cache-maven-repository
2626
with:
@@ -35,7 +35,7 @@ jobs:
3535
${{ runner.os }}-test-maven-plugin-
3636
- name: Run tests
3737
env:
38-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3939
run: |
4040
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

.github/workflows/maven-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Build
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v7
1616
with:
1717
fetch-depth: 0
1818

@@ -23,7 +23,7 @@ jobs:
2323
distribution: 'zulu'
2424

2525
- name: Cache Maven packages
26-
uses: actions/cache@v5
26+
uses: actions/cache@v6
2727
with:
2828
path: ~/.m2
2929
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -41,7 +41,7 @@ jobs:
4141
contents: read
4242
packages: write
4343
steps:
44-
- uses: actions/checkout@v5
44+
- uses: actions/checkout@v7
4545
with:
4646
fetch-depth: 0
4747

@@ -74,7 +74,7 @@ jobs:
7474
permissions:
7575
contents: write
7676
steps:
77-
- uses: actions/checkout@v5
77+
- uses: actions/checkout@v7
7878
with:
7979
fetch-depth: 0
8080

@@ -85,7 +85,7 @@ jobs:
8585
distribution: 'zulu'
8686

8787
- name: Cache Maven packages
88-
uses: actions/cache@v5
88+
uses: actions/cache@v6
8989
with:
9090
path: ~/.m2
9191
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/mill-plugin-tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
name: Mill plugin tests
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v7
1717
- name: Set up JDK 11
1818
uses: actions/setup-java@v5
1919
with:
2020
java-version: 11
2121
distribution: 'temurin'
2222
- name: Restore cache (read-only)
2323
# only use restore keys, no save key because we need to clear the cache before running the examples
24-
uses: actions/cache/restore@v5
24+
uses: actions/cache/restore@v6
2525
with:
2626
path: |
2727
~/.m2/repository
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Maven Clean Install
3636
env:
37-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
37+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3838
run: |
3939
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
4040
@@ -51,19 +51,19 @@ jobs:
5151
5252
- name: Mill Example - Test Validation Command
5353
env:
54-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
54+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5555
run: |
5656
(cd modules/openapi-generator-mill-plugin/example/ && ./mill validateOpenapiSpec $(pwd)/api/petstore-invalid.yaml)
5757
5858
- name: Mill Example - Test Validation Task
5959
env:
60-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
60+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6161
run: |
6262
(cd modules/openapi-generator-mill-plugin/example/ && ./mill openapi.validate)
6363
6464
- name: Mill Example - Test Compile Task
6565
env:
66-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
66+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6767
run: |
6868
(cd modules/openapi-generator-mill-plugin/example/ && ./mill __.compile)
6969

.github/workflows/misc-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Misc tests
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v7
1919
- uses: ruby/setup-ruby@v1
2020
with:
2121
ruby-version: '2.6'

0 commit comments

Comments
 (0)