Skip to content

Commit 8b9560e

Browse files
timonriegertimonrieger
committed
update java code
1 parent 6bc8eb4 commit 8b9560e

777 files changed

Lines changed: 2236 additions & 2287 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.

‎docs/generators/python-aiohttp.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5353
## LANGUAGE PRIMITIVES
5454

5555
<ul class="column-ul">
56-
<li>Dict</li>
57-
<li>List</li>
5856
<li>UUID</li>
5957
<li>bool</li>
6058
<li>bytes</li>

‎docs/generators/python-blueplanet.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5353
## LANGUAGE PRIMITIVES
5454

5555
<ul class="column-ul">
56-
<li>Dict</li>
57-
<li>List</li>
5856
<li>UUID</li>
5957
<li>bool</li>
6058
<li>bytes</li>

‎docs/generators/python-fastapi.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
4848
## LANGUAGE PRIMITIVES
4949

5050
<ul class="column-ul">
51-
<li>Dict</li>
52-
<li>List</li>
5351
<li>UUID</li>
5452
<li>bool</li>
5553
<li>bytes</li>

‎docs/generators/python-flask.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5353
## LANGUAGE PRIMITIVES
5454

5555
<ul class="column-ul">
56-
<li>Dict</li>
57-
<li>List</li>
5856
<li>UUID</li>
5957
<li>bool</li>
6058
<li>bytes</li>

‎docs/generators/python-pydantic-v1.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
4848
## LANGUAGE PRIMITIVES
4949

5050
<ul class="column-ul">
51-
<li>Dict</li>
52-
<li>List</li>
5351
<li>bool</li>
5452
<li>bytearray</li>
5553
<li>bytes</li>

‎docs/generators/python.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5151
## LANGUAGE PRIMITIVES
5252

5353
<ul class="column-ul">
54-
<li>Dict</li>
55-
<li>List</li>
5654
<li>UUID</li>
5755
<li>bool</li>
5856
<li>bytearray</li>

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

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ public AbstractPythonCodegen() {
101101
languageSpecificPrimitives.add("float");
102102
languageSpecificPrimitives.add("list");
103103
languageSpecificPrimitives.add("dict");
104-
languageSpecificPrimitives.add("List");
105-
languageSpecificPrimitives.add("Dict");
106104
languageSpecificPrimitives.add("bool");
107105
languageSpecificPrimitives.add("str");
108106
languageSpecificPrimitives.add("datetime");
@@ -896,7 +894,6 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
896894
if (!model.oneOf.isEmpty()) { // oneOfValidationError
897895
codegenProperties = model.getComposedSchemas().getOneOf();
898896
moduleImports.add("typing", "Any");
899-
moduleImports.add("typing", "List");
900897
moduleImports.add("pydantic", "Field");
901898
moduleImports.add("pydantic", "StrictStr");
902899
moduleImports.add("pydantic", "ValidationError");
@@ -932,11 +929,7 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
932929
// if model_generic.mustache is used
933930
if (model.oneOf.isEmpty() && model.anyOf.isEmpty() && !model.isEnum) {
934931
moduleImports.add("typing", "ClassVar");
935-
moduleImports.add("typing", "Dict");
936932
moduleImports.add("typing", "Any");
937-
if (this.disallowAdditionalPropertiesIfNotPresent || model.isAdditionalPropertiesTrue) {
938-
moduleImports.add("typing", "List");
939-
}
940933
}
941934

942935
// if pydantic model
@@ -1571,7 +1564,7 @@ public PythonType addTypeParam(PythonType typeParam) {
15711564
* The Python / Pydantic type can be as expressive as needed:
15721565
*
15731566
* - it could simply be `str`
1574-
* - or something more complex like `Optional[List[Dict[str, List[int]]]]`.
1567+
* - or something more complex like `Optional[list[dict[str, list[int]]]]`.
15751568
*
15761569
* Note that the default value (if available) and/or the metadata about
15771570
* the field / variable being defined are *not* part of the
@@ -1773,13 +1766,9 @@ private PythonType arrayType(IJsonSchemaValidationProperties cp) {
17731766
// Also, having a set instead of list creates complications:
17741767
// random JSON serialization order, unable to easily serialize
17751768
// to JSON, etc.
1776-
//pt.setType("Set");
1777-
//moduleImports.add("typing", "Set");
1778-
pt.setType("List");
1779-
moduleImports.add("typing", "List");
1769+
pt.setType("list");
17801770
} else {
1781-
pt.setType("List");
1782-
moduleImports.add("typing", "List");
1771+
pt.setType("list");
17831772
}
17841773
pt.addTypeParam(collectionItemType(cp.getItems()));
17851774
return pt;
@@ -1828,8 +1817,7 @@ private PythonType stringType(IJsonSchemaValidationProperties cp) {
18281817
}
18291818

18301819
private PythonType mapType(IJsonSchemaValidationProperties cp) {
1831-
moduleImports.add("typing", "Dict");
1832-
PythonType pt = new PythonType("Dict");
1820+
PythonType pt = new PythonType("dict");
18331821
pt.addTypeParam(new PythonType("str"));
18341822
pt.addTypeParam(collectionItemType(cp.getItems()));
18351823
return pt;
@@ -1954,9 +1942,7 @@ private PythonType binaryType(IJsonSchemaValidationProperties cp) {
19541942
pt.addTypeParam(strt);
19551943

19561944
if (cp.getIsBinary()) {
1957-
moduleImports.add("typing", "Tuple");
1958-
1959-
PythonType tt = new PythonType("Tuple");
1945+
PythonType tt = new PythonType("tuple");
19601946
// this string is a filename, not a validated value
19611947
tt.addTypeParam(new PythonType("str"));
19621948
tt.addTypeParam(bytest);
@@ -1976,9 +1962,7 @@ private PythonType binaryType(IJsonSchemaValidationProperties cp) {
19761962
pt.addTypeParam(new PythonType("StrictStr"));
19771963

19781964
if (cp.getIsBinary()) {
1979-
moduleImports.add("typing", "Tuple");
1980-
1981-
PythonType tt = new PythonType("Tuple");
1965+
PythonType tt = new PythonType("tuple");
19821966
tt.addTypeParam(new PythonType("StrictStr"));
19831967
tt.addTypeParam(new PythonType("StrictBytes"));
19841968

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ public AbstractPythonConnexionServerCodegen(String templateDirectory, boolean fi
100100
MAPPER.registerModule(simpleModule);
101101

102102
// TODO may remove these later to default to the setting in abstract python base class instead
103-
languageSpecificPrimitives.add("List");
104-
languageSpecificPrimitives.add("Dict");
105-
typeMapping.put("array", "List");
106-
typeMapping.put("map", "Dict");
103+
languageSpecificPrimitives.add("list");
104+
languageSpecificPrimitives.add("dict");
105+
typeMapping.put("array", "list");
106+
typeMapping.put("map", "dict");
107107

108108
// set the output folder here
109109
outputFolder = "generated-code" + File.separatorChar + "connexion";

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ public AbstractPythonPydanticV1Codegen() {
9191
languageSpecificPrimitives.add("float");
9292
languageSpecificPrimitives.add("list");
9393
languageSpecificPrimitives.add("dict");
94-
languageSpecificPrimitives.add("List");
95-
languageSpecificPrimitives.add("Dict");
9694
languageSpecificPrimitives.add("bool");
9795
languageSpecificPrimitives.add("str");
9896
languageSpecificPrimitives.add("datetime");
@@ -843,7 +841,6 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
843841
if (!model.oneOf.isEmpty()) { // oneOfValidationError
844842
codegenProperties = model.getComposedSchemas().getOneOf();
845843
typingImports.add("Any");
846-
typingImports.add("List");
847844
pydanticImports.add("Field");
848845
pydanticImports.add("StrictStr");
849846
pydanticImports.add("ValidationError");
@@ -879,7 +876,6 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
879876
if (model.oneOf.isEmpty() && model.anyOf.isEmpty()
880877
&& !model.isEnum
881878
&& !this.disallowAdditionalPropertiesIfNotPresent) {
882-
typingImports.add("Dict");
883879
typingImports.add("Any");
884880
}
885881

@@ -1070,8 +1066,7 @@ private String getPydanticType(CodegenParameter cp,
10701066
getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname),
10711067
constraints);
10721068
} else if (cp.isMap) {
1073-
typingImports.add("Dict");
1074-
return String.format(Locale.ROOT, "Dict[str, %s]",
1069+
return String.format(Locale.ROOT, "dict[str, %s]",
10751070
getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname));
10761071
} else if (cp.isString) {
10771072
if (cp.hasValidation) {
@@ -1266,9 +1261,8 @@ private String getPydanticType(CodegenParameter cp,
12661261
} else if (cp.isUuid) {
12671262
return cp.dataType;
12681263
} else if (cp.isFreeFormObject) { // type: object
1269-
typingImports.add("Dict");
12701264
typingImports.add("Any");
1271-
return "Dict[str, Any]";
1265+
return "dict[str, Any]";
12721266
} else if (!cp.isPrimitiveType) {
12731267
// add model prefix
12741268
hasModelsToImport = true;
@@ -1351,13 +1345,11 @@ private String getPydanticType(CodegenProperty cp,
13511345
constraints += ", unique_items=True";
13521346
}
13531347
pydanticImports.add("conlist");
1354-
typingImports.add("List"); // for return type
13551348
return String.format(Locale.ROOT, "conlist(%s%s)",
13561349
getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname),
13571350
constraints);
13581351
} else if (cp.isMap) {
1359-
typingImports.add("Dict");
1360-
return String.format(Locale.ROOT, "Dict[str, %s]", getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname));
1352+
return String.format(Locale.ROOT, "dict[str, %s]", getPydanticType(cp.items, typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, postponedModelImports, postponedExampleImports, classname));
13611353
} else if (cp.isString) {
13621354
if (cp.hasValidation) {
13631355
List<String> fieldCustomization = new ArrayList<>();
@@ -1550,9 +1542,8 @@ private String getPydanticType(CodegenProperty cp,
15501542
} else if (cp.isUuid) {
15511543
return cp.dataType;
15521544
} else if (cp.isFreeFormObject) { // type: object
1553-
typingImports.add("Dict");
15541545
typingImports.add("Any");
1555-
return "Dict[str, Any]";
1546+
return "dict[str, Any]";
15561547
} else if (!cp.isPrimitiveType || cp.isModel) { // model
15571548
// skip import if it's a circular reference
15581549
if (classname == null) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ public PythonClientCodegen() {
9696
importMapping.clear();
9797

9898
// override type mapping in abstract python codegen
99-
typeMapping.put("array", "List");
100-
typeMapping.put("set", "List");
101-
typeMapping.put("map", "Dict");
99+
typeMapping.put("array", "list");
100+
typeMapping.put("set", "list");
101+
typeMapping.put("map", "dict");
102102
typeMapping.put("decimal", "decimal.Decimal");
103103
typeMapping.put("file", "bytearray");
104104
typeMapping.put("binary", "bytearray");

0 commit comments

Comments
 (0)