[Codegen] Convert "any type" to oneOf model

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

@@ -74,7 +74,26 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
  public Set<String> allMandatory = new TreeSet<String>(); // with parent's required properties
 
  public Set<String> imports = new TreeSet<String>();
- public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArrayModel, hasChildren, isMapModel, isDeprecated;
+ public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum;
+ /**
+ * Indicates the OAS schema specifies "nullable: true".
+ */
+ public boolean isNullable;
+ /**
+ * Indicates the type has at least one required property.
+ */
+ public boolean hasRequired;
+ /**
+ * Indicates the type has at least one optional property.
+ */
+ public boolean hasOptional;
+ public boolean isArrayModel;
+ public boolean hasChildren;
+ public boolean isMapModel;
+ /**
+ * Indicates the OAS schema specifies "deprecated: true".
+ */
+ public boolean isDeprecated;
  public boolean hasOnlyReadOnly = true; // true if all properties are read-only
  public ExternalDocumentation externalDocumentation;
 

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

@@ -1774,6 +1774,10 @@ public String toDefaultValueWithParam(String name, Schema schema) {
  **/
  @SuppressWarnings("static-method")
  public String getSchemaType(Schema schema) {
+ if (schema == null) {
+ // This is indicative of a bug in codegen.
+ throw new RuntimeException("getSchemaType schema argument is null");
+ }
  if (schema instanceof ComposedSchema) { // composed schema
  ComposedSchema cs = (ComposedSchema) schema;
  // Get the interfaces, i.e. the set of elements under 'allOf', 'anyOf' or 'oneOf'.
@@ -1886,7 +1890,9 @@ public String toOneOfName(List<String> names, ComposedSchema composedSchema) {
  */
  private String getSingleSchemaType(Schema schema) {
  Schema unaliasSchema = ModelUtils.unaliasSchema(this.openAPI, schema, importMapping);
-
+ if (unaliasSchema == null) {
+ throw new RuntimeException("Schema '" + schema.getName() + "' is invalid");
+ }
  if (StringUtils.isNotBlank(unaliasSchema.get$ref())) { // reference to another definition/schema
  // get the schema/model name from $ref
  String schemaName = ModelUtils.getSimpleRef(unaliasSchema.get$ref());
@@ -2010,7 +2016,7 @@ public String getTypeDeclaration(String name) {
  }
 
  /**
- * Output the type declaration of the property
+ * Output the language-specific type declaration of the property.
  *
  * @param schema property schema
  * @return a string presentation of the property type
@@ -2100,6 +2106,36 @@ public String toModelName(final String name) {
  return camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix);
  }
 
+ // Returns a model that encapsulates the JSON schema "any type". Its value
+ // can be any of null, integer, boolean, number, string, array or map.
+ // "Any type" is a schema that does not have the "type" attribute
+ // specified in the OpenAPI schema. That means the value can be any valid
+ // payload, i.e. the null value, boolean, string, integer, number,
+ // array or map.
+ // Numerical payloads may match more than one type, for example "2" may
+ // match integer and number. Hence the use of 'anyOf'.
+ public CodegenModel getAnyTypeModel(String name, Schema schema) {
+ if (!ModelUtils.isAnyTypeSchema(schema)) {
+ throw new RuntimeException("Schema '" + name + "' is not 'any type'");
+ }
+ ComposedSchema cs = (ComposedSchema) new ComposedSchema()
+ .addAnyOfItem(new ObjectSchema().type("null"))
+ .addAnyOfItem(new BooleanSchema())
+ .addAnyOfItem(new StringSchema())
+ .addAnyOfItem(new IntegerSchema())
+ .addAnyOfItem(new NumberSchema())
+ .name(name);
+ // The map keys must be strings and the values can be anything.
+ cs.addAnyOfItem(new MapSchema().additionalProperties(true));
+ // The array items can be anything.
+ cs.addAnyOfItem(new ArraySchema());
+ if (schema != null) {
+ cs.setTitle(schema.getTitle());
+ cs.setDescription(schema.getDescription());
+ }
+ return fromModel(name, cs);
+ }
+
  /**
  * Convert OAS Model object to Codegen Model object
  *
@@ -2121,6 +2157,11 @@ public CodegenModel fromModel(String name, Schema schema) {
  return null;
  }
 
+ if (ModelUtils.isAnyTypeSchema(schema)) {
+ LOGGER.warn("Schema is any type: {}", name);
+ return getAnyTypeModel(name, schema);
+ }
+
  CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
 
  if (reservedWords.contains(name)) {
@@ -2155,7 +2196,6 @@ public CodegenModel fromModel(String name, Schema schema) {
  m.xmlNamespace = schema.getXml().getNamespace();
  m.xmlName = schema.getXml().getName();
  }
-
  if (ModelUtils.isArraySchema(schema)) {
  m.isArrayModel = true;
  m.arrayModelType = fromProperty(name, schema).complexType;

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

@@ -327,10 +327,23 @@ public String getTypeDeclaration(Schema p) {
  if (ModelUtils.isArraySchema(p)) {
  ArraySchema ap = (ArraySchema) p;
  Schema inner = ap.getItems();
- return "[]" + getTypeDeclaration(ModelUtils.unaliasSchema(this.openAPI, inner));
+ // Per JSON schema specification, the "items" attribute in an Array schema
+ // is optional. When "items" is not specified, the elements of the array
+ // may be anything at all.
+ if (inner != null) {
+ inner = ModelUtils.unaliasSchema(this.openAPI, inner);
+ }
+ String typDecl;
+ if (inner != null) {
+ typDecl = getTypeDeclaration(inner);
+ } else {
+ typDecl = "interface{}";
+ }
+ return "[]" + typDecl;
  } else if (ModelUtils.isMapSchema(p)) {
  Schema inner = ModelUtils.getAdditionalProperties(p);
- return getSchemaType(p) + "[string]" + getTypeDeclaration(ModelUtils.unaliasSchema(this.openAPI, inner));
+ inner = ModelUtils.unaliasSchema(this.openAPI, inner);
+ return getSchemaType(p) + "[string]" + getTypeDeclaration(inner);
  }
  //return super.getTypeDeclaration(p);
 

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

@@ -910,7 +910,14 @@ public String getTypeString(Schema p, String prefix, String suffix) {
  } else if (ModelUtils.isArraySchema(p)) {
  ArraySchema ap = (ArraySchema) p;
  Schema inner = ap.getItems();
- return prefix + "[" + getTypeString(inner, "", "") + "]" + fullSuffix;
+ if (inner == null) {
+ // Per JSON schema specification, the array "items" attribute is optional.
+ // When "items" is not specified, the elements of the array
+ // may be anything at all.
+ return prefix + "[bool, date, datetime, dict, float, int, list, str, none_type]" + fullSuffix;
+ } else {
+ return prefix + "[" + getTypeString(inner, "", "") + "]" + fullSuffix;
+ }
  }
  if (ModelUtils.isFileSchema(p)) {
  return prefix + "file_type" + fullSuffix;