Skip to content

Commit e619529

Browse files
author
Andrew Wilson
authored
Merge branch 'master' into andrew.wilson/protoCustomOptions
2 parents a60b995 + b4378a6 commit e619529

453 files changed

Lines changed: 7270 additions & 1855 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/openapi-generator.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ jobs:
142142
path: modules/openapi-generator-cli/target
143143
- name: Delete samples that are entirely generated
144144
run: |
145+
rm -rf samples/client/petstore/csharp/generichost/latest/HelloWorld
145146
rm -rf samples/client/petstore/csharp/generichost/latest/Tags
146147
147148
rm -rf samples/client/petstore/csharp/generichost/net8/AllOf

‎.github/workflows/samples-dotnet9.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
matrix:
2525
sample:
2626
- samples/client/petstore/csharp/generichost/latest/Tags
27+
- samples/client/petstore/csharp/generichost/latest/HelloWorld
2728
- samples/client/petstore/csharp/generichost/net9/AllOf
2829
- samples/client/petstore/csharp/generichost/net9/AnyOf
2930
- samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare

‎appveyor.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ build_script:
4343
#- dotnet build samples\client\petstore\csharp\OpenAPIClient-ConditionalSerialization\Org.OpenAPITools.sln
4444

4545
test_script:
46+
- dotnet test samples\client\petstore\csharp\generichost\latest\Tags\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
47+
- dotnet test samples\client\petstore\csharp\generichost\latest\HelloWorld\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
48+
4649
- dotnet test samples\client\petstore\csharp\generichost\net9\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4750
- dotnet test samples\client\petstore\csharp\generichost\net9\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
4851
- dotnet test samples\client\petstore\csharp\generichost\net9\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj

‎bin/configs/csharp-generichost-latest-helloWorld.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/generichost/latest/HelloWorld
4+
inputSpec: modules/openapi-generator/src/test/resources/3_1/csharp/hello-world.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/csharp
6+
additionalProperties:
7+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
8+
modelPropertySorting: alphabetical
9+
operationParameterSorting: alphabetical

bin/configs/csharp-generichost-tags-latest.yaml renamed to bin/configs/csharp-generichost-latest-tags.yaml

File renamed without changes.

‎bin/configs/protobuf-schema-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ additionalProperties:
1818
option java_multiple_files = false;
1919
option java_package = "com.example.tutorial.protos.model";
2020
option java_outer_classname = "ExampleProtos";
21+
useSimplifiedEnumNames: true
2122
typeMappings:
2223
object: "google.protobuf.Struct"
2324
importMappings:

‎docs/customization.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,13 @@ Example:
601601
java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml -o /tmp/java-okhttp/ --openapi-normalizer REMOVE_X_INTERNAL=true
602602
```
603603
604+
- `NORMALIZER_CLASS`: Set to full classname of a class extending the default org.openapitools.codegen.OpenAPINormalizer. It allows customization of the default normalizer.
605+
606+
Example:
607+
```
608+
java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/required-properties.yaml -o /tmp/java-okhttp/ --openapi-normalizer NORMALIZER_CLASS=org.openapitools.codegen.OpenAPINormalizerTest$RemoveRequiredNormalizer
609+
```
610+
604611
- `FILTER`
605612
606613
The `FILTER` parameter allows selective inclusion of API operations based on specific criteria. It applies the `x-internal: true` property to operations that do **not** match the specified values, preventing them from being generated.

‎docs/generators/protobuf-schema.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2525
|numberedFieldNumberList|Field numbers in order.| |false|
2626
|startEnumsWithUnspecified|Introduces "UNSPECIFIED" as the first element of enumerations.| |false|
2727
|supportMultipleResponses|Support multiple responses| |true|
28+
|useSimplifiedEnumNames|Use a simple name for enums| |false|
2829
|wrapComplexType|Generate Additional message for complex type| |true|
2930

3031
## IMPORT MAPPING

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ void configureGeneratorProperties() {
261261
if (version.atLeast("3.1.0")) {
262262
config.openapiNormalizer().put("NORMALIZE_31SPEC", "true");
263263
}
264-
OpenAPINormalizer openapiNormalizer = new OpenAPINormalizer(openAPI, config.openapiNormalizer());
264+
OpenAPINormalizer openapiNormalizer = OpenAPINormalizer.createNormalizer(openAPI, config.openapiNormalizer());
265265
openapiNormalizer.normalize();
266266
}
267267
} catch (Exception e) {

0 commit comments

Comments
 (0)