Skip to content

Commit 4effa73

Browse files
wing328wing328
authored
Add AnyType support to Java generators (#6246)
* add anytype support to java * fix test * fix primitive type * update tests * update samples
1 parent 779b176 commit 4effa73

72 files changed

Lines changed: 221 additions & 264 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.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3110,9 +3110,15 @@ public CodegenProperty fromProperty(String name, Schema p) {
31103110
} else if (ModelUtils.isFreeFormObject(p)) {
31113111
property.isFreeFormObject = true;
31123112
property.baseType = getSchemaType(p);
3113+
if (languageSpecificPrimitives.contains(property.dataType)) {
3114+
property.isPrimitiveType = true;
3115+
}
31133116
} else if (ModelUtils.isAnyTypeSchema(p)) {
31143117
property.isAnyType = true;
31153118
property.baseType = getSchemaType(p);
3119+
if (languageSpecificPrimitives.contains(property.dataType)) {
3120+
property.isPrimitiveType = true;
3121+
}
31163122
} else { // model
31173123
setNonArrayMapProperty(property, type);
31183124
Schema refOrCurrent = ModelUtils.getReferencedSchema(this.openAPI, p);

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import io.swagger.v3.oas.models.PathItem;
2424
import io.swagger.v3.oas.models.media.ArraySchema;
2525
import io.swagger.v3.oas.models.media.Schema;
26-
import io.swagger.v3.oas.models.media.StringSchema;
2726
import io.swagger.v3.oas.models.servers.Server;
2827
import io.swagger.v3.parser.util.SchemaTypeUtil;
29-
import java.time.LocalDate;
30-
import java.time.ZoneId;
3128
import org.apache.commons.io.FilenameUtils;
3229
import org.apache.commons.lang3.BooleanUtils;
3330
import org.apache.commons.lang3.StringUtils;
@@ -38,6 +35,8 @@
3835
import org.slf4j.LoggerFactory;
3936

4037
import java.io.File;
38+
import java.time.LocalDate;
39+
import java.time.ZoneId;
4140
import java.util.*;
4241
import java.util.regex.Pattern;
4342

@@ -82,7 +81,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
8281
protected String licenseUrl = "http://unlicense.org";
8382
protected String projectFolder = "src/main";
8483
protected String projectTestFolder = "src/test";
85-
protected String sourceFolder = projectFolder + File.separator +"java";
84+
protected String sourceFolder = projectFolder + File.separator + "java";
8685
protected String testFolder = projectTestFolder + "/java";
8786
protected boolean fullJavaUtil;
8887
protected boolean discriminatorCaseSensitive = true; // True if the discriminator value lookup should be case-sensitive.
@@ -169,6 +168,7 @@ public AbstractJavaCodegen() {
169168
instantiationTypes.put("map", "HashMap");
170169
typeMapping.put("date", "Date");
171170
typeMapping.put("file", "File");
171+
typeMapping.put("AnyType", "Object");
172172

173173
cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
174174
cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@@ -389,12 +389,12 @@ public void processOpts() {
389389
this.setFullJavaUtil(Boolean.valueOf(additionalProperties.get(FULL_JAVA_UTIL).toString()));
390390
}
391391
if (additionalProperties.containsKey(DISCRIMINATOR_CASE_SENSITIVE)) {
392-
this.setDiscriminatorCaseSensitive(Boolean.valueOf(additionalProperties.get(DISCRIMINATOR_CASE_SENSITIVE).toString()));
392+
this.setDiscriminatorCaseSensitive(Boolean.valueOf(additionalProperties.get(DISCRIMINATOR_CASE_SENSITIVE).toString()));
393393
} else {
394394
// By default, the discriminator lookup should be case sensitive. There is nothing in the OpenAPI specification
395395
// that indicates the lookup should be case insensitive. However, some implementations perform
396396
// a case-insensitive lookup.
397-
this.setDiscriminatorCaseSensitive(Boolean.TRUE);
397+
this.setDiscriminatorCaseSensitive(Boolean.TRUE);
398398
}
399399
additionalProperties.put(DISCRIMINATOR_CASE_SENSITIVE, this.discriminatorCaseSensitive);
400400

@@ -843,12 +843,11 @@ public String toDefaultValue(Schema schema) {
843843
} else if (ModelUtils.isStringSchema(schema)) {
844844
if (schema.getDefault() != null) {
845845
String _default;
846-
if (schema.getDefault() instanceof Date){
846+
if (schema.getDefault() instanceof Date) {
847847
Date date = (Date) schema.getDefault();
848848
LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
849849
return String.format(Locale.ROOT, localDate.toString(), "");
850-
}
851-
else{
850+
} else {
852851
_default = (String) schema.getDefault();
853852
}
854853
if (schema.getEnum() == null) {
@@ -1113,7 +1112,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
11131112
}
11141113

11151114
// TODO: Setting additionalProperties is not the responsibility of this method. These side-effects should be moved elsewhere to prevent unexpected behaviors.
1116-
if(artifactVersion == null) {
1115+
if (artifactVersion == null) {
11171116
// If no artifactVersion is provided in additional properties, version from API specification is used.
11181117
// If none of them is provided then fallbacks to default version
11191118
if (additionalProperties.containsKey(CodegenConstants.ARTIFACT_VERSION) && additionalProperties.get(CodegenConstants.ARTIFACT_VERSION) != null) {
@@ -1445,7 +1444,7 @@ public void setFullJavaUtil(boolean fullJavaUtil) {
14451444

14461445
/**
14471446
* Set whether discriminator value lookup is case-sensitive or not.
1448-
*
1447+
*
14491448
* @param discriminatorCaseSensitive true if the discriminator value lookup should be case sensitive.
14501449
*/
14511450
public void setDiscriminatorCaseSensitive(boolean discriminatorCaseSensitive) {

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ public void testFreeFormObjects() {
544544
codegen.setOpenAPI(openAPI);
545545
CodegenModel cm1 = codegen.fromModel("MapTest1", test1);
546546
Assert.assertEquals(cm1.getDataType(), "Map");
547-
Assert.assertEquals(cm1.getParent(), "HashMap<String, oas_any_type_not_mapped>");
547+
Assert.assertEquals(cm1.getParent(), "HashMap<String, Object>");
548548
Assert.assertEquals(cm1.getClassname(), "MapTest1");
549549

550550
Schema test2 = openAPI.getComponents().getSchemas().get("MapTest2");
@@ -683,29 +683,29 @@ public void testAnyType() {
683683

684684
final CodegenProperty property1 = cm1.allVars.get(0);
685685
Assert.assertEquals(property1.baseName, "any_value");
686-
Assert.assertEquals(property1.dataType, "oas_any_type_not_mapped");
686+
Assert.assertEquals(property1.dataType, "Object");
687687
Assert.assertTrue(property1.hasMore);
688-
Assert.assertFalse(property1.isPrimitiveType);
688+
Assert.assertTrue(property1.isPrimitiveType);
689689
Assert.assertFalse(property1.isContainer);
690690
Assert.assertFalse(property1.isFreeFormObject);
691691
Assert.assertTrue(property1.isAnyType);
692692

693693
final CodegenProperty property2 = cm1.allVars.get(1);
694694
Assert.assertEquals(property2.baseName, "any_value_with_desc");
695-
Assert.assertEquals(property2.dataType, "oas_any_type_not_mapped");
695+
Assert.assertEquals(property2.dataType, "Object");
696696
Assert.assertTrue(property2.hasMore);
697697
Assert.assertFalse(property2.required);
698-
Assert.assertFalse(property2.isPrimitiveType);
698+
Assert.assertTrue(property2.isPrimitiveType);
699699
Assert.assertFalse(property2.isContainer);
700700
Assert.assertFalse(property2.isFreeFormObject);
701701
Assert.assertTrue(property2.isAnyType);
702702

703703
final CodegenProperty property3 = cm1.allVars.get(2);
704704
Assert.assertEquals(property3.baseName, "any_value_nullable");
705-
Assert.assertEquals(property3.dataType, "oas_any_type_not_mapped");
705+
Assert.assertEquals(property3.dataType, "Object");
706706
Assert.assertFalse(property3.hasMore);
707707
Assert.assertFalse(property3.required);
708-
Assert.assertFalse(property3.isPrimitiveType);
708+
Assert.assertTrue(property3.isPrimitiveType);
709709
Assert.assertFalse(property3.isContainer);
710710
Assert.assertFalse(property3.isFreeFormObject);
711711
Assert.assertTrue(property3.isAnyType);
@@ -717,63 +717,63 @@ public void testAnyType() {
717717

718718
final CodegenProperty cp1 = cm2.vars.get(0);
719719
Assert.assertEquals(cp1.baseName, "any_value");
720-
Assert.assertEquals(cp1.dataType, "oas_any_type_not_mapped");
720+
Assert.assertEquals(cp1.dataType, "Object");
721721
Assert.assertTrue(cp1.hasMore);
722722
Assert.assertFalse(cp1.required);
723-
Assert.assertFalse(cp1.isPrimitiveType);
723+
Assert.assertTrue(cp1.isPrimitiveType);
724724
Assert.assertFalse(cp1.isContainer);
725725
Assert.assertFalse(cp1.isFreeFormObject);
726726
Assert.assertTrue(cp1.isAnyType);
727727

728728
final CodegenProperty cp2 = cm2.vars.get(1);
729729
Assert.assertEquals(cp2.baseName, "any_value_with_desc");
730-
Assert.assertEquals(cp2.dataType, "oas_any_type_not_mapped");
730+
Assert.assertEquals(cp2.dataType, "Object");
731731
Assert.assertTrue(cp2.hasMore);
732732
Assert.assertFalse(cp2.required);
733-
Assert.assertFalse(cp2.isPrimitiveType);
733+
Assert.assertTrue(cp2.isPrimitiveType);
734734
Assert.assertFalse(cp2.isContainer);
735735
Assert.assertFalse(cp2.isFreeFormObject);
736736
Assert.assertTrue(cp2.isAnyType);
737737

738738
final CodegenProperty cp3 = cm2.vars.get(2);
739739
Assert.assertEquals(cp3.baseName, "any_value_nullable");
740-
Assert.assertEquals(cp3.dataType, "oas_any_type_not_mapped");
740+
Assert.assertEquals(cp3.dataType, "Object");
741741
Assert.assertTrue(cp3.hasMore);
742742
Assert.assertFalse(cp3.required);
743-
Assert.assertFalse(cp3.isPrimitiveType);
743+
Assert.assertTrue(cp3.isPrimitiveType);
744744
Assert.assertFalse(cp3.isContainer);
745745
Assert.assertFalse(cp3.isFreeFormObject);
746746
Assert.assertTrue(cp3.isAnyType);
747747

748748
// map
749749
final CodegenProperty cp4 = cm2.vars.get(3);
750750
Assert.assertEquals(cp4.baseName, "map_any_value");
751-
Assert.assertEquals(cp4.dataType, "Map<String, oas_any_type_not_mapped>");
751+
Assert.assertEquals(cp4.dataType, "Map<String, Object>");
752752
Assert.assertTrue(cp4.hasMore);
753753
Assert.assertFalse(cp4.required);
754-
Assert.assertFalse(cp4.isPrimitiveType);
754+
Assert.assertTrue(cp4.isPrimitiveType);
755755
Assert.assertTrue(cp4.isContainer);
756756
Assert.assertTrue(cp4.isMapContainer);
757757
Assert.assertTrue(cp4.isFreeFormObject);
758758
Assert.assertFalse(cp4.isAnyType);
759759

760760
final CodegenProperty cp5 = cm2.vars.get(4);
761761
Assert.assertEquals(cp5.baseName, "map_any_value_with_desc");
762-
Assert.assertEquals(cp5.dataType, "Map<String, oas_any_type_not_mapped>");
762+
Assert.assertEquals(cp5.dataType, "Map<String, Object>");
763763
Assert.assertTrue(cp5.hasMore);
764764
Assert.assertFalse(cp5.required);
765-
Assert.assertFalse(cp5.isPrimitiveType);
765+
Assert.assertTrue(cp5.isPrimitiveType);
766766
Assert.assertTrue(cp5.isContainer);
767767
Assert.assertTrue(cp5.isMapContainer);
768768
Assert.assertTrue(cp5.isFreeFormObject);
769769
Assert.assertFalse(cp5.isAnyType);
770770

771771
final CodegenProperty cp6 = cm2.vars.get(5);
772772
Assert.assertEquals(cp6.baseName, "map_any_value_nullable");
773-
Assert.assertEquals(cp6.dataType, "Map<String, oas_any_type_not_mapped>");
773+
Assert.assertEquals(cp6.dataType, "Map<String, Object>");
774774
Assert.assertTrue(cp6.hasMore);
775775
Assert.assertFalse(cp6.required);
776-
Assert.assertFalse(cp6.isPrimitiveType);
776+
Assert.assertTrue(cp6.isPrimitiveType);
777777
Assert.assertTrue(cp6.isContainer);
778778
Assert.assertTrue(cp6.isMapContainer);
779779
Assert.assertTrue(cp6.isFreeFormObject);
@@ -782,32 +782,32 @@ public void testAnyType() {
782782
// array
783783
final CodegenProperty cp7 = cm2.vars.get(6);
784784
Assert.assertEquals(cp7.baseName, "array_any_value");
785-
Assert.assertEquals(cp7.dataType, "List<oas_any_type_not_mapped>");
785+
Assert.assertEquals(cp7.dataType, "List<Object>");
786786
Assert.assertTrue(cp7.hasMore);
787787
Assert.assertFalse(cp7.required);
788-
Assert.assertFalse(cp7.isPrimitiveType);
788+
Assert.assertTrue(cp7.isPrimitiveType);
789789
Assert.assertTrue(cp7.isContainer);
790790
Assert.assertTrue(cp7.isListContainer);
791791
Assert.assertFalse(cp7.isFreeFormObject);
792792
Assert.assertFalse(cp7.isAnyType);
793793

794794
final CodegenProperty cp8 = cm2.vars.get(7);
795795
Assert.assertEquals(cp8.baseName, "array_any_value_with_desc");
796-
Assert.assertEquals(cp8.dataType, "List<oas_any_type_not_mapped>");
796+
Assert.assertEquals(cp8.dataType, "List<Object>");
797797
Assert.assertTrue(cp8.hasMore);
798798
Assert.assertFalse(cp8.required);
799-
Assert.assertFalse(cp8.isPrimitiveType);
799+
Assert.assertTrue(cp8.isPrimitiveType);
800800
Assert.assertTrue(cp8.isContainer);
801801
Assert.assertTrue(cp8.isListContainer);
802802
Assert.assertFalse(cp8.isFreeFormObject);
803803
Assert.assertFalse(cp8.isAnyType);
804804

805805
final CodegenProperty cp9 = cm2.vars.get(8);
806806
Assert.assertEquals(cp9.baseName, "array_any_value_nullable");
807-
Assert.assertEquals(cp9.dataType, "List<oas_any_type_not_mapped>");
807+
Assert.assertEquals(cp9.dataType, "List<Object>");
808808
Assert.assertFalse(cp9.hasMore);
809809
Assert.assertFalse(cp9.required);
810-
Assert.assertFalse(cp9.isPrimitiveType);
810+
Assert.assertTrue(cp9.isPrimitiveType);
811811
Assert.assertTrue(cp9.isContainer);
812812
Assert.assertTrue(cp9.isListContainer);
813813
Assert.assertFalse(cp9.isFreeFormObject);

‎samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
1111
**MapArrayAnytype** | **Dictionary&lt;string, List&lt;Object&gt;&gt;** | | [optional]
1212
**MapMapString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** | | [optional]
1313
**MapMapAnytype** | **Dictionary&lt;string, Dictionary&lt;string, Object&gt;&gt;** | | [optional]
14-
**Anytype1** | [**Object**](.md) | | [optional]
15-
**Anytype2** | [**Object**](.md) | | [optional]
16-
**Anytype3** | [**Object**](.md) | | [optional]
14+
**Anytype1** | **Object** | | [optional]
15+
**Anytype2** | **Object** | | [optional]
16+
**Anytype3** | **Object** | | [optional]
1717

1818
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1919

‎samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Name | Type | Description | Notes
1111
**MapArrayAnytype** | **Dictionary&lt;string, List&lt;Object&gt;&gt;** | | [optional]
1212
**MapMapString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** | | [optional]
1313
**MapMapAnytype** | **Dictionary&lt;string, Dictionary&lt;string, Object&gt;&gt;** | | [optional]
14-
**Anytype1** | [**Object**](.md) | | [optional]
15-
**Anytype2** | [**Object**](.md) | | [optional]
16-
**Anytype3** | [**Object**](.md) | | [optional]
14+
**Anytype1** | **Object** | | [optional]
15+
**Anytype2** | **Object** | | [optional]
16+
**Anytype3** | **Object** | | [optional]
1717

1818
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
1919

‎samples/client/petstore/csharp/OpenAPIClient/docs/AdditionalPropertiesClass.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ Name | Type | Description | Notes
1313
**MapArrayAnytype** | **Dictionary&lt;string, List&lt;Object&gt;&gt;** | | [optional]
1414
**MapMapString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** | | [optional]
1515
**MapMapAnytype** | **Dictionary&lt;string, Dictionary&lt;string, Object&gt;&gt;** | | [optional]
16-
**Anytype1** | [**Object**](.md) | | [optional]
17-
**Anytype2** | [**Object**](.md) | | [optional]
18-
**Anytype3** | [**Object**](.md) | | [optional]
16+
**Anytype1** | **Object** | | [optional]
17+
**Anytype2** | **Object** | | [optional]
18+
**Anytype3** | **Object** | | [optional]
1919

2020
[[Back to Model list]](../README.md#documentation-for-models)
2121
[[Back to API list]](../README.md#documentation-for-api-endpoints)

‎samples/client/petstore/elixir/lib/openapi_petstore/model/additional_properties_class.ex‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ defmodule OpenapiPetstore.Model.AdditionalPropertiesClass do
3838
end
3939

4040
defimpl Poison.Decoder, for: OpenapiPetstore.Model.AdditionalPropertiesClass do
41-
import OpenapiPetstore.Deserializer
42-
def decode(value, options) do
41+
def decode(value, _options) do
4342
value
44-
|> deserialize(:"anytype_1", :struct, OpenapiPetstore.Model.Map, options)
45-
|> deserialize(:"anytype_2", :struct, OpenapiPetstore.Model.Map, options)
46-
|> deserialize(:"anytype_3", :struct, OpenapiPetstore.Model.Map, options)
4743
end
4844
end
4945

‎samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
1212
**MapArrayAnytype** | Pointer to [**map[string][]map[string]interface{}**](array.md) | | [optional]
1313
**MapMapString** | Pointer to [**map[string]map[string]string**](map.md) | | [optional]
1414
**MapMapAnytype** | Pointer to [**map[string]map[string]map[string]interface{}**](map.md) | | [optional]
15-
**Anytype1** | Pointer to [**map[string]interface{}**](.md) | | [optional]
16-
**Anytype2** | Pointer to [**map[string]interface{}**](.md) | | [optional]
17-
**Anytype3** | Pointer to [**map[string]interface{}**](.md) | | [optional]
15+
**Anytype1** | Pointer to **map[string]interface{}** | | [optional]
16+
**Anytype2** | Pointer to **map[string]interface{}** | | [optional]
17+
**Anytype3** | Pointer to **map[string]interface{}** | | [optional]
1818

1919
## Methods
2020

‎samples/client/petstore/go/go-petstore-withXml/docs/AdditionalPropertiesClass.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
1212
**MapArrayAnytype** | [**map[string][]map[string]interface{}**](array.md) | | [optional]
1313
**MapMapString** | [**map[string]map[string]string**](map.md) | | [optional]
1414
**MapMapAnytype** | [**map[string]map[string]map[string]interface{}**](map.md) | | [optional]
15-
**Anytype1** | [**map[string]interface{}**](.md) | | [optional]
16-
**Anytype2** | [**map[string]interface{}**](.md) | | [optional]
17-
**Anytype3** | [**map[string]interface{}**](.md) | | [optional]
15+
**Anytype1** | **map[string]interface{}** | | [optional]
16+
**Anytype2** | **map[string]interface{}** | | [optional]
17+
**Anytype3** | **map[string]interface{}** | | [optional]
1818

1919
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
2020

‎samples/client/petstore/go/go-petstore/docs/AdditionalPropertiesClass.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Name | Type | Description | Notes
1212
**MapArrayAnytype** | [**map[string][]map[string]interface{}**](array.md) | | [optional]
1313
**MapMapString** | [**map[string]map[string]string**](map.md) | | [optional]
1414
**MapMapAnytype** | [**map[string]map[string]map[string]interface{}**](map.md) | | [optional]
15-
**Anytype1** | [**map[string]interface{}**](.md) | | [optional]
16-
**Anytype2** | [**map[string]interface{}**](.md) | | [optional]
17-
**Anytype3** | [**map[string]interface{}**](.md) | | [optional]
15+
**Anytype1** | **map[string]interface{}** | | [optional]
16+
**Anytype2** | **map[string]interface{}** | | [optional]
17+
**Anytype3** | **map[string]interface{}** | | [optional]
1818

1919
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
2020

0 commit comments

Comments
 (0)