loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-05-12 20:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove CodegenConfig.fromModel(String, Schema) method (#90)

Browse Source
This commit is contained in:
Jérémie Bresson 2018-05-26 20:18:16 +02:00 committed by GitHub
parent 685a4ab6b1
commit 0ece706a46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 292 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
View File

@ -17,10 +17,6 @@
package org.openapitools.codegen;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.samskivert.mustache.Mustache.Compiler;
import io.swagger.v3.oas.models.OpenAPI;
@ -28,6 +24,10 @@ import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.security.SecurityScheme;
import java.util.List;
import java.util.Map;
import java.util.Set;
public interface CodegenConfig {
CodegenType getTag();
@ -103,8 +103,6 @@ public interface CodegenConfig {
void setOutputDir(String dir);
CodegenModel fromModel(String name, Schema schema);
CodegenModel fromModel(String name, Schema schema, Map<String, Schema> allDefinitions);
CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Schema> definitions, OpenAPI openAPI);

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

@ -1369,17 +1369,6 @@ public class DefaultCodegen implements CodegenConfig {
return initialCaps(modelNamePrefix + name + modelNameSuffix);
}
/**
* Convert OAS Model object to Codegen Model object without providing all model definitions
*
* @param name the name of the model
* @param schema OAS Model object
* @return Codegen Model object
*/
public CodegenModel fromModel(String name, Schema schema) {
return fromModel(name, schema, null);
}
/**
* Convert OAS Model object to Codegen Model object
*

42
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
View File

@ -19,6 +19,26 @@ package org.openapitools.codegen.languages;
import static com.google.common.base.Strings.isNullOrEmpty;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.Schema;
import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenParameter;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.utils.ModelUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@ -29,26 +49,6 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.*;
import org.openapitools.codegen.utils.ModelUtils;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.core.util.Json;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractEiffelCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractEiffelCodegen.class);
@ -476,7 +476,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
if (allDefinitions != null && codegenModel.parentSchema != null && codegenModel.hasEnums) {
final Schema parentModel = allDefinitions.get(codegenModel.parentSchema);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel, allDefinitions);
codegenModel = AbstractEiffelCodegen.reconcileInlineEnums(codegenModel, parentCodegenModel);
}
return codegenModel;

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -868,7 +868,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
}
if (allDefinitions != null && codegenModel.parentSchema != null && codegenModel.hasEnums) {
final Schema parentModel = allDefinitions.get(codegenModel.parentSchema);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel, allDefinitions);
codegenModel = AbstractJavaCodegen.reconcileInlineEnums(codegenModel, parentCodegenModel);
}
return codegenModel;

2
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
View File

@ -532,7 +532,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
if (allDefinitions != null && codegenModel != null && codegenModel.parent != null) {
final Schema parentModel = allDefinitions.get(toModelName(codegenModel.parent));
if (parentModel != null) {
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel, allDefinitions);
if (codegenModel.hasEnums) {
codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
}

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
View File

@ -816,11 +816,6 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig {
}
}
@Override
public CodegenModel fromModel(String name, Schema schema) {
return fromModel(name, schema, null);
}
@Override
public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
CodegenModel mdl = super.fromModel(name, model, allDefinitions);

35
modules/openapi-generator/src/test/java/org/openapitools/codegen/csharp/CSharpModelTest.java
View File

@ -17,12 +17,8 @@
package org.openapitools.codegen.csharp;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.CSharpClientCodegen;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
@ -30,9 +26,16 @@ import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.CSharpClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class CSharpModelTest {
@ -41,7 +44,7 @@ public class CSharpModelTest {
final Schema schema = getArrayTestSchema();
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel generated = codegen.fromModel("sample", schema);
final CodegenModel generated = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(generated.name, "sample");
Assert.assertEquals(generated.classname, "Sample");
@ -68,7 +71,7 @@ public class CSharpModelTest {
final CSharpClientCodegen codegen = new CSharpClientCodegen();
codegen.setUseCollection(true);
final CodegenModel generated = codegen.fromModel("sample", schema);
final CodegenModel generated = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(generated.name, "sample");
Assert.assertEquals(generated.vars.size(), 2);
@ -92,7 +95,7 @@ public class CSharpModelTest {
codegen.setUseCollection(true);
codegen.setReturnICollection(true);
final CodegenModel generated = codegen.fromModel("sample", schema);
final CodegenModel generated = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(generated.name, "sample");
Assert.assertEquals(generated.vars.size(), 2);
@ -128,7 +131,7 @@ public class CSharpModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -174,7 +177,7 @@ public class CSharpModelTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -212,7 +215,7 @@ public class CSharpModelTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -236,7 +239,7 @@ public class CSharpModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/components/schemas/Children"));
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -258,7 +261,7 @@ public class CSharpModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/components/schemas/Children")));
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -283,7 +286,7 @@ public class CSharpModelTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/components/schemas/Children")));
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -308,7 +311,7 @@ public class CSharpModelTest {
.items(new Schema().$ref("#/components/schemas/Children"))
.description("an array model");
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -325,7 +328,7 @@ public class CSharpModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/components/schemas/Children"));
final DefaultCodegen codegen = new CSharpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

37
modules/openapi-generator/src/test/java/org/openapitools/codegen/go/GoModelTest.java
View File

@ -17,19 +17,26 @@
package org.openapitools.codegen.go;
import org.openapitools.codegen.languages.GoClientCodegen;
import org.openapitools.codegen.*;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import com.google.common.collect.Sets;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.GoClientCodegen;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class GoModelTest {
@ -43,7 +50,7 @@ public class GoModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -91,7 +98,7 @@ public class GoModelTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -127,7 +134,7 @@ public class GoModelTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -151,7 +158,7 @@ public class GoModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -173,7 +180,7 @@ public class GoModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -197,7 +204,7 @@ public class GoModelTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -222,7 +229,7 @@ public class GoModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -237,7 +244,7 @@ public class GoModelTest {
.additionalProperties(new Schema().$ref("#/definitions/Children"))
.description("a map model");
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -264,7 +271,7 @@ public class GoModelTest {
public void modelNameTest(String name, String expectedName) {
final Schema model = new Schema();
final DefaultCodegen codegen = new GoClientCodegen();
final CodegenModel cm = codegen.fromModel(name, model);
final CodegenModel cm = codegen.fromModel(name, model, Collections.singletonMap(name, model));
Assert.assertEquals(cm.name, name);
Assert.assertEquals(cm.classname, expectedName);

3
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View File

@ -191,8 +191,9 @@ public class JavaClientCodegenTest {
@Test
public void nullValuesInComposedSchema() throws Exception {
final JavaClientCodegen codegen = new JavaClientCodegen();
ComposedSchema schema = new ComposedSchema();
CodegenModel result = codegen.fromModel("CompSche",
new ComposedSchema());
schema, Collections.singletonMap("CompSche", schema));
Assert.assertEquals(result.name, "CompSche");
}

7
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java
View File

@ -30,6 +30,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@ -41,7 +42,7 @@ public class JavaModelEnumTest {
final Schema model = new Schema().type("object").addProperties("name", enumSchema);
final JavaClientCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.vars.size(), 1);
@ -62,7 +63,7 @@ public class JavaModelEnumTest {
final Schema model = new Schema().type("object").addProperties("name", enumSchema);
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.vars.size(), 1);
@ -93,7 +94,7 @@ public class JavaModelEnumTest {
final Schema model = new Schema().type("object").addProperties("name", enumSchema);
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.vars.size(), 1);

56
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
View File

@ -80,7 +80,7 @@ public class JavaModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -142,7 +142,7 @@ public class JavaModelTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -170,7 +170,7 @@ public class JavaModelTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -198,7 +198,7 @@ public class JavaModelTest {
.additionalProperties(new ArraySchema().items(new Schema().$ref("Pet"))))
.addRequiredItem("id");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -225,7 +225,7 @@ public class JavaModelTest {
.addProperties("list2D", new ArraySchema().items(
new ArraySchema().items(new Schema().$ref("Pet"))));
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.vars.size(), 1);
@ -248,7 +248,7 @@ public class JavaModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/components/schemas/Children"));
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -274,7 +274,7 @@ public class JavaModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/components/schemas/Children")));
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -302,7 +302,7 @@ public class JavaModelTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/components/schemas/Children")));
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -339,7 +339,7 @@ public class JavaModelTest {
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -373,7 +373,7 @@ public class JavaModelTest {
.name("arraySchema")
.description("an array model");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -390,7 +390,7 @@ public class JavaModelTest {
.description("an map model")
.additionalProperties(new Schema().$ref("#/components/schemas/Children"));
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -408,7 +408,7 @@ public class JavaModelTest {
.addProperties("NAME", new StringSchema())
.addRequiredItem("NAME");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -434,7 +434,7 @@ public class JavaModelTest {
.addProperties("pId", new StringSchema())
.addRequiredItem("pId");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -460,7 +460,7 @@ public class JavaModelTest {
.addProperties("ATTName", new StringSchema())
.addRequiredItem("ATTName");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -485,7 +485,7 @@ public class JavaModelTest {
.description("a sample model")
.addProperties("created-at", new DateTimeSchema());
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property = cm.vars.get(0);
Assert.assertEquals(property.baseName, "created-at");
@ -500,7 +500,7 @@ public class JavaModelTest {
.description("a sample model")
.addProperties("query[password]", new StringSchema());
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property = cm.vars.get(0);
Assert.assertEquals(property.baseName, "query[password]");
@ -515,7 +515,7 @@ public class JavaModelTest {
.description("a sample model")
.addProperties("created-at", new DateTimeSchema());
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("with.dots", schema);
final CodegenModel cm = codegen.fromModel("with.dots", schema, Collections.singletonMap("with.dots", schema));
Assert.assertEquals(cm.classname, "WithDots");
}
@ -526,7 +526,7 @@ public class JavaModelTest {
.description("model with binary")
.addProperties("inputBinaryData", new ByteArraySchema());
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property = cm.vars.get(0);
Assert.assertEquals(property.baseName, "inputBinaryData");
@ -547,7 +547,7 @@ public class JavaModelTest {
.description("a model with a 2nd char upper-case property names")
.addProperties("_", new StringSchema());
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -580,18 +580,20 @@ public class JavaModelTest {
@Test(description = "types used by inner properties should be imported")
public void mapWithAnListOfBigDecimalTest() {
final CodegenModel cm1 = new JavaClientCodegen().fromModel("sample", new Schema()
Schema schema1 = new Schema()
.description("model with Map<String, List<BigDecimal>>")
.addProperties("map", new MapSchema()
.additionalProperties(new ArraySchema().items(new NumberSchema()))));
.additionalProperties(new ArraySchema().items(new NumberSchema())));
final CodegenModel cm1 = new JavaClientCodegen().fromModel("sample", schema1, Collections.singletonMap("sample", schema1));
Assert.assertEquals(cm1.vars.get(0).dataType, "Map<String, List<BigDecimal>>");
Assert.assertTrue(cm1.imports.contains("BigDecimal"));
final CodegenModel cm2 = new JavaClientCodegen().fromModel("sample", new Schema()
Schema schema2 = new Schema()
.description("model with Map<String, Map<String, List<BigDecimal>>>")
.addProperties("map", new MapSchema()
.additionalProperties(new MapSchema()
.additionalProperties(new ArraySchema().items(new NumberSchema())))));
.additionalProperties(new ArraySchema().items(new NumberSchema()))));
final CodegenModel cm2 = new JavaClientCodegen().fromModel("sample", schema2, Collections.singletonMap("sample", schema2));
Assert.assertEquals(cm2.vars.get(0).dataType, "Map<String, Map<String, List<BigDecimal>>>");
Assert.assertTrue(cm2.imports.contains("BigDecimal"));
}
@ -614,7 +616,7 @@ public class JavaModelTest {
public void modelNameTest(String name, String expectedName) {
final Schema schema = new Schema();
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel(name, schema);
final CodegenModel cm = codegen.fromModel(name, schema, Collections.singletonMap(name, schema));
Assert.assertEquals(cm.name, name);
Assert.assertEquals(cm.classname, expectedName);
@ -635,7 +637,7 @@ public class JavaModelTest {
.description("a sample model")
.addProperties(baseName, new StringSchema());
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property = cm.vars.get(0);
Assert.assertEquals(property.baseName, baseName);
@ -668,7 +670,7 @@ public class JavaModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -733,7 +735,7 @@ public class JavaModelTest {
.name("xmlArray")))
.addRequiredItem("id");
final DefaultCodegen codegen = new JavaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

10
modules/openapi-generator/src/test/java/org/openapitools/codegen/javascript/JavascriptClientCodegenTest.java
View File

@ -19,16 +19,16 @@ package org.openapitools.codegen.javascript;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.*;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.languages.JavascriptClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.openapitools.codegen.languages.JavascriptClientCodegen;
public class JavascriptClientCodegenTest {
@Test
@ -71,7 +71,7 @@ public class JavascriptClientCodegenTest {
final OpenAPI openAPI = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore.yaml", null, new ParseOptions()).getOpenAPI();
final JavascriptClientCodegen codegen = new JavascriptClientCodegen();
final Schema pet = openAPI.getComponents().getSchemas().get("Pet");
final CodegenModel cm = codegen.fromModel("Pet", pet);
final CodegenModel cm = codegen.fromModel("Pet", pet, openAPI.getComponents().getSchemas());
Assert.assertEquals(cm.name, "Pet");
Assert.assertEquals(cm.classname, "Pet");

18
modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/KotlinClientCodegenModelTest.java
View File

@ -33,6 +33,8 @@ import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class KotlinClientCodegenModelTest {
@ -72,7 +74,7 @@ public class KotlinClientCodegenModelTest {
final Schema schema = getSimpleSchema();
final DefaultCodegen codegen = new KotlinClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -119,7 +121,7 @@ public class KotlinClientCodegenModelTest {
codegen.setDateLibrary(KotlinClientCodegen.DateLibrary.THREETENBP.value);
codegen.processOpts();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
@ -139,7 +141,7 @@ public class KotlinClientCodegenModelTest {
codegen.setDateLibrary(KotlinClientCodegen.DateLibrary.STRING.value);
codegen.processOpts();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
@ -159,7 +161,7 @@ public class KotlinClientCodegenModelTest {
codegen.setDateLibrary(KotlinClientCodegen.DateLibrary.JAVA8.value);
codegen.processOpts();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
final CodegenProperty property3 = cm.vars.get(2);
Assert.assertEquals(property3.baseName, "createdAt");
@ -177,7 +179,7 @@ public class KotlinClientCodegenModelTest {
final Schema model = getArrayTestSchema();
final DefaultCodegen codegen = new KotlinClientCodegen();
final CodegenModel generated = codegen.fromModel("sample", model);
final CodegenModel generated = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(generated.name, "sample");
Assert.assertEquals(generated.classname, "Sample");
@ -201,7 +203,7 @@ public class KotlinClientCodegenModelTest {
public void mapPropertyTest() {
final Schema schema = getMapSchema();
final DefaultCodegen codegen = new KotlinClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -223,7 +225,7 @@ public class KotlinClientCodegenModelTest {
public void complexPropertyTest() {
final Schema schema = getComplexSchema();
final DefaultCodegen codegen = new KotlinClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -254,7 +256,7 @@ public class KotlinClientCodegenModelTest {
public void sanitizeModelNames(final String name, final ModelNameTest testCase) {
final Schema schema = getComplexSchema();
final DefaultCodegen codegen = new KotlinClientCodegen();
final CodegenModel cm = codegen.fromModel(name, schema);
final CodegenModel cm = codegen.fromModel(name, schema, Collections.singletonMap(name, schema));
Assert.assertEquals(cm.name, testCase.expectedName);
Assert.assertEquals(cm.classname, testCase.expectedClassName);

45
modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcModelTest.java
View File

@ -17,24 +17,31 @@
package org.openapitools.codegen.objc;
import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.PathItem;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.Discriminator;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.ObjcClientCodegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import com.google.common.collect.Sets;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
import java.util.Map;
@SuppressWarnings("static-method")
@ -48,7 +55,7 @@ public class ObjcModelTest {
.additionalProperties(new MapSchema().additionalProperties(new StringSchema())))
.addRequiredItem("id");
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -76,7 +83,7 @@ public class ObjcModelTest {
.addRequiredItem("name")
.discriminator(new Discriminator().mapping("test", "test"));
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -126,7 +133,7 @@ public class ObjcModelTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -165,7 +172,7 @@ public class ObjcModelTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -190,7 +197,7 @@ public class ObjcModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -213,7 +220,7 @@ public class ObjcModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -238,7 +245,7 @@ public class ObjcModelTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -264,7 +271,7 @@ public class ObjcModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "OAISample");
@ -281,7 +288,7 @@ public class ObjcModelTest {
.description("a map model for testing ObjC generator")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("map_model", model);
final CodegenModel cm = codegen.fromModel("map_model", model, Collections.singletonMap("map_model", model));
Assert.assertEquals(cm.name, "map_model");
Assert.assertEquals(cm.classname, "OAIMapModel");
@ -322,7 +329,7 @@ public class ObjcModelTest {
final OpenAPI model = new OpenAPIParser().readLocation("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI();
final DefaultCodegen codegen = new ObjcClientCodegen();
final Schema definition = model.getComponents().getSchemas().get("AnimalFarm");
final CodegenModel codegenModel = codegen.fromModel("AnimalFarm",definition);
final CodegenModel codegenModel = codegen.fromModel("AnimalFarm", definition, Collections.singletonMap("AnimalFarm", definition));
Assert.assertEquals(codegenModel.isArrayModel, true);
Assert.assertEquals(codegenModel.arrayModelType,"OAIAnimal");

48
modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpModelTest.java
View File

@ -17,28 +17,32 @@
package org.openapitools.codegen.php;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.PhpClientCodegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@SuppressWarnings("static-method")
public class PhpModelTest {
@ -54,7 +58,7 @@ public class PhpModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -106,7 +110,7 @@ public class PhpModelTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -144,7 +148,7 @@ public class PhpModelTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -168,7 +172,7 @@ public class PhpModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -191,7 +195,7 @@ public class PhpModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -215,7 +219,7 @@ public class PhpModelTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -242,7 +246,7 @@ public class PhpModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(model.getDescription(), "an array model");
@ -260,7 +264,7 @@ public class PhpModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -288,7 +292,7 @@ public class PhpModelTest {
public void modelNameTest(String name, String expectedName) {
final Schema model = new Schema();
final DefaultCodegen codegen = new PhpClientCodegen();
final CodegenModel cm = codegen.fromModel(name, model);
final CodegenModel cm = codegen.fromModel(name, model, Collections.singletonMap(name, model));
Assert.assertEquals(cm.name, name);
Assert.assertEquals(cm.classname, expectedName);

44
modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonTest.java
View File

@ -17,23 +17,29 @@
package org.openapitools.codegen.python;
import com.google.common.collect.Sets;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.PythonClientCodegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.common.collect.Sets;
import java.util.Collections;
@SuppressWarnings("static-method")
public class PythonTest {
@ -43,12 +49,12 @@ public class PythonTest {
final OpenAPI openAPI= new OpenAPIParser().readLocation("src/test/resources/2_0/v1beta3.json", null, new ParseOptions()).getOpenAPI();
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel simpleName = codegen.fromModel("v1beta3.Binding", openAPI.getComponents().getSchemas().get("v1beta3.Binding"));
final CodegenModel simpleName = codegen.fromModel("v1beta3.Binding", openAPI.getComponents().getSchemas().get("v1beta3.Binding"), openAPI.getComponents().getSchemas());
Assert.assertEquals(simpleName.name, "v1beta3.Binding");
Assert.assertEquals(simpleName.classname, "V1beta3Binding");
Assert.assertEquals(simpleName.classVarName, "v1beta3_binding");
final CodegenModel compoundName = codegen.fromModel("v1beta3.ComponentStatus", openAPI.getComponents().getSchemas().get("v1beta3.ComponentStatus"));
final CodegenModel compoundName = codegen.fromModel("v1beta3.ComponentStatus", openAPI.getComponents().getSchemas().get("v1beta3.ComponentStatus"), openAPI.getComponents().getSchemas());
Assert.assertEquals(compoundName.name, "v1beta3.ComponentStatus");
Assert.assertEquals(compoundName.classname, "V1beta3ComponentStatus");
Assert.assertEquals(compoundName.classVarName, "v1beta3_component_status");
@ -70,7 +76,7 @@ public class PythonTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -116,7 +122,7 @@ public class PythonTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -154,7 +160,7 @@ public class PythonTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -178,7 +184,7 @@ public class PythonTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -201,7 +207,7 @@ public class PythonTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -226,7 +232,7 @@ public class PythonTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -254,7 +260,7 @@ public class PythonTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -272,7 +278,7 @@ public class PythonTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new PythonClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

27
modules/openapi-generator/src/test/java/org/openapitools/codegen/scalaakka/ScalaAkkaClientCodegenTest.java
View File

@ -18,8 +18,15 @@
package org.openapitools.codegen.scalaakka;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.MapSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
@ -27,6 +34,8 @@ import org.openapitools.codegen.languages.ScalaAkkaClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
public class ScalaAkkaClientCodegenTest {
private ScalaAkkaClientCodegen scalaAkkaClientCodegen;
@ -41,7 +50,7 @@ public class ScalaAkkaClientCodegenTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -94,7 +103,7 @@ public class ScalaAkkaClientCodegenTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -122,7 +131,7 @@ public class ScalaAkkaClientCodegenTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -148,7 +157,7 @@ public class ScalaAkkaClientCodegenTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -174,7 +183,7 @@ public class ScalaAkkaClientCodegenTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -202,7 +211,7 @@ public class ScalaAkkaClientCodegenTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -231,7 +240,7 @@ public class ScalaAkkaClientCodegenTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -248,7 +257,7 @@ public class ScalaAkkaClientCodegenTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ScalaAkkaClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

36
modules/openapi-generator/src/test/java/org/openapitools/codegen/scalahttpclient/ScalaHttpClientModelTest.java
View File

@ -17,17 +17,7 @@
package org.openapitools.codegen.scalahttpclient;
import org.testng.Assert;
import org.testng.annotations.Test;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.languages.ScalaHttpClientCodegen;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.ScalaHttpClientCodegen;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
@ -37,11 +27,15 @@ import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import com.google.common.collect.Sets;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.ScalaHttpClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class ScalaHttpClientModelTest {
@ -55,7 +49,7 @@ public class ScalaHttpClientModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -108,7 +102,7 @@ public class ScalaHttpClientModelTest {
.items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -136,7 +130,7 @@ public class ScalaHttpClientModelTest {
.additionalProperties(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -162,7 +156,7 @@ public class ScalaHttpClientModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -188,7 +182,7 @@ public class ScalaHttpClientModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -216,7 +210,7 @@ public class ScalaHttpClientModelTest {
.addProperties("children", new MapSchema()
.additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -245,7 +239,7 @@ public class ScalaHttpClientModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -262,7 +256,7 @@ public class ScalaHttpClientModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ScalaHttpClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

14
modules/openapi-generator/src/test/java/org/openapitools/codegen/swift3/Swift3ModelTest.java
View File

@ -17,11 +17,6 @@
package org.openapitools.codegen.swift3;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.Swift3Codegen;
import io.swagger.v3.oas.models.media.BinarySchema;
import io.swagger.v3.oas.models.media.ByteArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
@ -32,9 +27,16 @@ import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.media.UUIDSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.Swift3Codegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class Swift3ModelTest {
@ -54,7 +56,7 @@ public class Swift3ModelTest {
.discriminator(new Discriminator().propertyName("test"));
final DefaultCodegen codegen = new Swift3Codegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

14
modules/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4ModelTest.java
View File

@ -17,11 +17,6 @@
package org.openapitools.codegen.swift4;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.Swift4Codegen;
import io.swagger.v3.oas.models.media.BinarySchema;
import io.swagger.v3.oas.models.media.ByteArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
@ -32,9 +27,16 @@ import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.oas.models.media.UUIDSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.Swift4Codegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class Swift4ModelTest {
@ -53,7 +55,7 @@ public class Swift4ModelTest {
.addRequiredItem("name")
.discriminator(new Discriminator().propertyName("test"));
final DefaultCodegen codegen = new Swift4Codegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

28
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java
View File

@ -18,14 +18,8 @@
package org.openapitools.codegen.typescript.fetch;
import com.google.common.collect.Sets;
import io.swagger.v3.parser.core.models.ParseOptions;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen;
import io.swagger.parser.OpenAPIParser;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
@ -33,12 +27,18 @@ import io.swagger.v3.oas.models.media.DateTimeSchema;
import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.parser.OpenAPIParser;
import io.swagger.v3.parser.core.models.ParseOptions;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
/*
@ -62,7 +62,7 @@ public class TypeScriptFetchModelTest {
.addRequiredItem("name");
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -118,7 +118,7 @@ public class TypeScriptFetchModelTest {
.addProperties("urls", new ArraySchema().items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -150,7 +150,7 @@ public class TypeScriptFetchModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -173,7 +173,7 @@ public class TypeScriptFetchModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -195,7 +195,7 @@ public class TypeScriptFetchModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -209,7 +209,7 @@ public class TypeScriptFetchModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

23
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangular/TypeScriptAngularModelTest.java
View File

@ -17,7 +17,8 @@
package org.openapitools.codegen.typescript.typescriptangular;
import org.openapitools.codegen.CodegenConstants;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
@ -25,15 +26,15 @@ import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.testng.Assert;
import org.testng.annotations.Test;
import com.google.common.collect.Sets;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.TypeScriptAngularClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class TypeScriptAngularModelTest {
@ -49,7 +50,7 @@ public class TypeScriptAngularModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new TypeScriptAngularClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model);
final CodegenModel cm = codegen.fromModel("sample", model, Collections.singletonMap("sample", model));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -107,7 +108,7 @@ public class TypeScriptAngularModelTest {
.addProperties("urls", new ArraySchema().items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new TypeScriptAngularClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -139,7 +140,7 @@ public class TypeScriptAngularModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptAngularClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -162,7 +163,7 @@ public class TypeScriptAngularModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new TypeScriptAngularClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -184,7 +185,7 @@ public class TypeScriptAngularModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new TypeScriptAngularClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -198,7 +199,7 @@ public class TypeScriptAngularModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptAngularClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

26
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptangularjs/TypeScriptAngularJsModelTest.java
View File

@ -17,13 +17,8 @@
package org.openapitools.codegen.typescript.typescriptangularjs;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.TypeScriptAngularJsClientCodegen;
import com.google.common.collect.Sets;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.DateSchema;
import io.swagger.v3.oas.models.media.DateTimeSchema;
@ -31,9 +26,16 @@ import io.swagger.v3.oas.models.media.IntegerSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.media.StringSchema;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.TypeScriptAngularJsClientCodegen;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class TypeScriptAngularJsModelTest {
@ -48,7 +50,7 @@ public class TypeScriptAngularJsModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new TypeScriptAngularJsClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -104,7 +106,7 @@ public class TypeScriptAngularJsModelTest {
.addProperties("urls", new ArraySchema().items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new TypeScriptAngularJsClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -135,7 +137,7 @@ public class TypeScriptAngularJsModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptAngularJsClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -158,7 +160,7 @@ public class TypeScriptAngularJsModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new TypeScriptAngularJsClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -180,7 +182,7 @@ public class TypeScriptAngularJsModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new TypeScriptAngularJsClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -194,7 +196,7 @@ public class TypeScriptAngularJsModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptAngularJsClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");

14
modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java
View File

@ -35,6 +35,8 @@ import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.Collections;
@SuppressWarnings("static-method")
public class TypeScriptNodeModelTest {
@ -49,7 +51,7 @@ public class TypeScriptNodeModelTest {
.addRequiredItem("id")
.addRequiredItem("name");
final DefaultCodegen codegen = new TypeScriptNodeClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -101,7 +103,7 @@ public class TypeScriptNodeModelTest {
.addProperties("urls", new ArraySchema().items(new StringSchema()))
.addRequiredItem("id");
final DefaultCodegen codegen = new TypeScriptNodeClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -132,7 +134,7 @@ public class TypeScriptNodeModelTest {
.description("a sample model")
.addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptNodeClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -154,7 +156,7 @@ public class TypeScriptNodeModelTest {
.addProperties("children", new ArraySchema()
.items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new TypeScriptNodeClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -176,7 +178,7 @@ public class TypeScriptNodeModelTest {
.items(new Schema().$ref("#/definitions/Children"))
.description("an array model");
final DefaultCodegen codegen = new TypeScriptNodeClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");
@ -190,7 +192,7 @@ public class TypeScriptNodeModelTest {
.description("a map model")
.additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new TypeScriptNodeClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", schema);
final CodegenModel cm = codegen.fromModel("sample", schema, Collections.singletonMap("sample", schema));
Assert.assertEquals(cm.name, "sample");
Assert.assertEquals(cm.classname, "Sample");