Skip to content

Commit feddcfe

Browse files
committed
Merge branch 'master' into fix-nullable-properties-not-read
2 parents 9a2a35b + 8998d83 commit feddcfe

192 files changed

Lines changed: 767 additions & 27242 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/samples-aspnet-fastenpoints-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- samples/server/petstore/aspnet/fastendpoints-useValidators
2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: actions/setup-dotnet@v4.2.0
29+
- uses: actions/setup-dotnet@v4.3.0
3030
with:
3131
dotnet-version: '8.0.x'
3232
- name: Build

.github/workflows/samples-dotnet-standard.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
2929
steps:
3030
- uses: actions/checkout@v4
31-
- uses: actions/setup-dotnet@v4.2.0
31+
- uses: actions/setup-dotnet@v4.3.0
3232
with:
3333
dotnet-version: 3.1.*
3434
- name: Build

.github/workflows/samples-dotnet6-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- samples/server/petstore/aspnetcore-6.0-useSwashBuckle
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: actions/setup-dotnet@v4.2.0
28+
- uses: actions/setup-dotnet@v4.3.0
2929
with:
3030
dotnet-version: '6.0.x'
3131
- name: Build

.github/workflows/samples-dotnet8-client-echo-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- samples/client/echo_api/csharp/restsharp/net8/EchoApi
2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: actions/setup-dotnet@v4.2.0
22+
- uses: actions/setup-dotnet@v4.3.0
2323
with:
2424
dotnet-version: '8.0.x'
2525
- name: Run echo server

.github/workflows/samples-dotnet8-client.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- samples/client/petstore/csharp/restsharp/net8/ParameterMappings/
1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: actions/setup-dotnet@v4.2.0
21+
- uses: actions/setup-dotnet@v4.3.0
2222
with:
2323
dotnet-version: '8.0.x'
2424
- name: Build

.github/workflows/samples-dotnet8-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management
2727
steps:
2828
- uses: actions/checkout@v4
29-
- uses: actions/setup-dotnet@v4.2.0
29+
- uses: actions/setup-dotnet@v4.3.0
3030
with:
3131
dotnet-version: '8.0.x'
3232
- name: Build

.github/workflows/samples-dotnet8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
3535
steps:
3636
- uses: actions/checkout@v4
37-
- uses: actions/setup-dotnet@v4.2.0
37+
- uses: actions/setup-dotnet@v4.3.0
3838
with:
3939
dotnet-version: '8.0.x'
4040
- name: Build

.github/workflows/samples-dotnet9.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
#- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
4444
steps:
4545
- uses: actions/checkout@v4
46-
- uses: actions/setup-dotnet@v4.2.0
46+
- uses: actions/setup-dotnet@v4.3.0
4747
with:
4848
dotnet-version: '9.0.101'
4949
- name: Build

bin/configs/typescript-axios-echo-api.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ generatorName: typescript-axios
22
outputDir: samples/client/echo_api/typescript-axios/build
33
inputSpec: modules/openapi-generator/src/test/resources/3_0/echo_api.yaml
44
templateDir: modules/openapi-generator/src/main/resources/typescript-axios
5+
httpUserAgent: EchoApi/1.0.0
56
additionalProperties:
67
artifactId: echo-api-typescript-axios
78
hideGenerationTimestamp: "true"

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift6ClientCodegen.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.openapitools.codegen.languages;
1919

20+
import com.samskivert.mustache.Mustache;
2021
import io.swagger.v3.oas.models.media.Schema;
2122
import lombok.Getter;
2223
import lombok.Setter;
@@ -608,6 +609,11 @@ public void processOpts() {
608609
}
609610
additionalProperties.put(COMBINE_DEFERRED, combineDeferred);
610611

612+
additionalProperties.put("transformArrayType", (Mustache.Lambda) (frag, out) -> {
613+
String type = frag.execute();
614+
out.write(transformArrayTypeName(type));
615+
});
616+
611617
// infrastructure destination folder
612618
final String infrastructureFolder = sourceFolder + File.separator + "Infrastructure";
613619

@@ -1090,6 +1096,17 @@ public String toEnumVarName(String name, String datatype) {
10901096
LOWERCASE_FIRST_LETTER);
10911097
}
10921098

1099+
public String transformArrayTypeName(String type) {
1100+
if (!type.startsWith("[") || !type.endsWith("]")) {
1101+
return type;
1102+
}
1103+
String innerType = type.substring(1, type.length() - 1);
1104+
String transformed = transformArrayTypeName(innerType);
1105+
1106+
return "ArrayOf" + transformed;
1107+
}
1108+
1109+
10931110
private Boolean isLanguageSpecificType(String name) {
10941111
return languageSpecificPrimitives.contains(name);
10951112
}

0 commit comments

Comments
 (0)