loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

add objc generator and test

Browse Source
This commit is contained in:
wing328 2018-03-26 15:50:50 +08:00
parent 0e6da5bbd5
commit 0e9dff995c
7 changed files with 195 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1310,7 +1310,6 @@ public class DefaultCodegen implements CodegenConfig {
} }
m.title = escapeText(schema.getTitle()); m.title = escapeText(schema.getTitle());
m.description = escapeText(schema.getDescription()); m.description = escapeText(schema.getDescription());
LOGGER.info("debugging fromModel: " + m.description);
m.unescapedDescription = schema.getDescription(); m.unescapedDescription = schema.getDescription();
m.classname = toModelName(name); m.classname = toModelName(name);
m.classVarName = toVarName(name); m.classVarName = toVarName(name);
@ -1401,7 +1400,7 @@ public class DefaultCodegen implements CodegenConfig {
m.parentSchema = parentName; m.parentSchema = parentName;
m.parent = toModelName(parentName); m.parent = toModelName(parentName);
addImport(m, m.parent); addImport(m, m.parent);
if (allDefinitions != null) { if (allDefinitions != null && !allDefinitions.isEmpty()) {
if (supportsInheritance) { if (supportsInheritance) {
addProperties(allProperties, allRequired, parent, allDefinitions); addProperties(allProperties, allRequired, parent, allDefinitions);
} else { } else {
@ -1435,7 +1434,7 @@ public class DefaultCodegen implements CodegenConfig {
m.allowableValues = new HashMap<String, Object>(); m.allowableValues = new HashMap<String, Object>();
m.allowableValues.put("values", schema.getEnum()); m.allowableValues.put("values", schema.getEnum());
} }
if (schema.getAdditionalProperties() != null) { if (schema.getAdditionalProperties() != null || schema instanceof MapSchema) {
addParentContainer(m, m.name, schema); addParentContainer(m, m.name, schema);
} }
addVars(m, schema.getProperties(), schema.getRequired()); addVars(m, schema.getProperties(), schema.getRequired());
@ -1446,6 +1445,7 @@ public class DefaultCodegen implements CodegenConfig {
postProcessModelProperty(m, prop); postProcessModelProperty(m, prop);
} }
} }
LOGGER.info("debugging fromModel return: " + m);
return m; return m;
} }
@ -2191,7 +2191,9 @@ public class DefaultCodegen implements CodegenConfig {
// add imports to operation import tag // add imports to operation import tag
for (String i : imports) { for (String i : imports) {
LOGGER.info("debugging fromOperation imports: " + i);
if (needToImport(i)) { if (needToImport(i)) {
LOGGER.info("debugging fromOperation imports: " + i + " imported");
op.imports.add(i); op.imports.add(i);
} }
} }
@ -3853,12 +3855,15 @@ public class DefaultCodegen implements CodegenConfig {
protected String getParentName(ComposedSchema composedSchema, Map<String, Schema> allSchemas) { protected String getParentName(ComposedSchema composedSchema, Map<String, Schema> allSchemas) {
if (composedSchema.getAllOf() != null && !composedSchema.getAllOf().isEmpty()) { if (composedSchema.getAllOf() != null && !composedSchema.getAllOf().isEmpty()) {
LOGGER.info("debugging getParentName if: " + composedSchema);
Schema schema = composedSchema.getAllOf().get(0); Schema schema = composedSchema.getAllOf().get(0);
String ref = schema.get$ref(); String ref = schema.get$ref();
if (StringUtils.isBlank(ref)) { if (StringUtils.isBlank(ref)) {
return null; return null;
} }
return getSimpleRef(ref); return getSimpleRef(ref);
} else {
LOGGER.info("debugging getParentName else: " + composedSchema);
} }
return null; return null;
} }
@ -4038,7 +4043,8 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.baseType = codegenModel.classname; codegenParameter.baseType = codegenModel.classname;
codegenParameter.dataType = getTypeDeclaration(codegenModel.classname); codegenParameter.dataType = getTypeDeclaration(codegenModel.classname);
codegenParameter.description = codegenModel.description; codegenParameter.description = codegenModel.description;
imports.add(codegenParameter.dataType); LOGGER.info("debugging fromRequestBody imports model: " + codegenParameter);
imports.add(codegenParameter.baseType);
} else { } else {
CodegenProperty codegenProperty = fromProperty("property", schema); CodegenProperty codegenProperty = fromProperty("property", schema);
if (codegenProperty != null) { if (codegenProperty != null) {
@ -4048,6 +4054,7 @@ public class DefaultCodegen implements CodegenConfig {
LOGGER.info("Setting description to body parameter: " + codegenProperty.description); LOGGER.info("Setting description to body parameter: " + codegenProperty.description);
if (codegenProperty.complexType != null) { if (codegenProperty.complexType != null) {
LOGGER.info("debugging fromRequestBody imports: " + codegenProperty.complexType);
imports.add(codegenProperty.complexType); imports.add(codegenProperty.complexType);
} }
} }

118
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java
View File

@ -1,9 +1,19 @@
package io.swagger.codegen.languages; package org.openapitools.codegen.languages;
import io.swagger.codegen.*; import org.openapitools.codegen.CliOption;
import io.swagger.models.ArrayModel; import org.openapitools.codegen.CodegenConfig;
import io.swagger.models.Model; import org.openapitools.codegen.CodegenConstants;
import io.swagger.models.properties.*; import org.openapitools.codegen.CodegenModel;
import org.openapitools.codegen.CodegenOperation;
import org.openapitools.codegen.CodegenParameter;
import org.openapitools.codegen.CodegenProperty;
import org.openapitools.codegen.CodegenType;
import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.SupportingFile;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
import io.swagger.v3.oas.models.media.*;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
@ -134,7 +144,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
"do", "int", "struct", "_Packed", "do", "int", "struct", "_Packed",
"double", "protocol", "interface", "implementation", "double", "protocol", "interface", "implementation",
"NSObject", "NSInteger", "NSNumber", "CGFloat", "NSObject", "NSInteger", "NSNumber", "CGFloat",
"property", "nonatomic", "retain", "strong", "schema", "nonatomic", "retain", "strong",
"weak", "unsafe_unretained", "readwrite", "readonly", "weak", "unsafe_unretained", "readwrite", "readonly",
"description" "description"
)); ));
@ -285,10 +295,10 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
public String toInstantiationType(Property p) { public String toInstantiationType(Schema p) {
if (p instanceof MapProperty) { if (p instanceof MapSchema) {
return instantiationTypes.get("map"); return instantiationTypes.get("map");
} else if (p instanceof ArrayProperty) { } else if (p instanceof ArraySchema) {
return instantiationTypes.get("array"); return instantiationTypes.get("array");
} else { } else {
return null; return null;
@ -305,8 +315,8 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
public String getSwaggerType(Property p) { public String getSchemaType(Schema p) {
String swaggerType = super.getSwaggerType(p); String swaggerType = super.getSchemaType(p);
String type = null; String type = null;
if (swaggerType == null) { if (swaggerType == null) {
@ -326,32 +336,32 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
public String getTypeDeclaration(Property p) { public String getTypeDeclaration(Schema p) {
if (p instanceof ArrayProperty) { if (p instanceof ArraySchema) {
ArrayProperty ap = (ArrayProperty) p; ArraySchema ap = (ArraySchema) p;
Property inner = ap.getItems(); Schema inner = ap.getItems();
String innerTypeDeclaration = getTypeDeclaration(inner); String innerTypeDeclaration = getTypeDeclaration(inner);
if (innerTypeDeclaration.endsWith("*")) { if (innerTypeDeclaration.endsWith("*")) {
innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1); innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
} }
// In this condition, type of property p is array of primitive, // In this condition, type of Schema p is array of primitive,
// return container type with pointer, e.g. `NSArray*<NSString*>*' // return container type with pointer, e.g. `NSArray*<NSString*>*'
if (languageSpecificPrimitives.contains(innerTypeDeclaration)) { if (languageSpecificPrimitives.contains(innerTypeDeclaration)) {
return getSwaggerType(p) + "<" + innerTypeDeclaration + "*>*"; return getSchemaType(p) + "<" + innerTypeDeclaration + "*>*";
} }
// In this condition, type of property p is array of model, // In this condition, type of Schema p is array of model,
// return container type combine inner type with pointer, e.g. `NSArray<SWGTag>*' // return container type combine inner type with pointer, e.g. `NSArray<SWGTag>*'
else { else {
for (String sd : advancedMapingTypes) { for (String sd : advancedMapingTypes) {
if(innerTypeDeclaration.startsWith(sd)) { if(innerTypeDeclaration.startsWith(sd)) {
return getSwaggerType(p) + "<" + innerTypeDeclaration + "*>*"; return getSchemaType(p) + "<" + innerTypeDeclaration + "*>*";
} }
} }
return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*"; return getSchemaType(p) + "<" + innerTypeDeclaration + ">*";
} }
} else if (p instanceof MapProperty) { } else if (p instanceof MapSchema) {
MapProperty mp = (MapProperty) p; MapSchema mp = (MapSchema) p;
Property inner = mp.getAdditionalProperties(); Schema inner = (Schema) mp.getAdditionalProperties();
String innerTypeDeclaration = getTypeDeclaration(inner); String innerTypeDeclaration = getTypeDeclaration(inner);
@ -359,17 +369,17 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1); innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
} }
if (languageSpecificPrimitives.contains(innerTypeDeclaration)) { if (languageSpecificPrimitives.contains(innerTypeDeclaration)) {
return getSwaggerType(p) + "<NSString*, " + innerTypeDeclaration + "*>*"; return getSchemaType(p) + "<NSString*, " + innerTypeDeclaration + "*>*";
} else { } else {
for (String s : advancedMapingTypes) { for (String s : advancedMapingTypes) {
if(innerTypeDeclaration.startsWith(s)) { if(innerTypeDeclaration.startsWith(s)) {
return getSwaggerType(p) + "<NSString*, " + innerTypeDeclaration + "*>*"; return getSchemaType(p) + "<NSString*, " + innerTypeDeclaration + "*>*";
} }
} }
return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*"; return getSchemaType(p) + "<" + innerTypeDeclaration + ">*";
} }
} else { } else {
String swaggerType = getSwaggerType(p); String swaggerType = getSchemaType(p);
// In this condition, type of p is objective-c primitive type, e.g. `NSSNumber', // In this condition, type of p is objective-c primitive type, e.g. `NSSNumber',
// return type of p with pointer, e.g. `NSNumber*' // return type of p with pointer, e.g. `NSNumber*'
if (languageSpecificPrimitives.contains(swaggerType) && if (languageSpecificPrimitives.contains(swaggerType) &&
@ -452,12 +462,12 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
protected void setNonArrayMapProperty(CodegenProperty property, String type) { protected void setNonArrayMapProperty(CodegenProperty schema, String type) {
super.setNonArrayMapProperty(property, type); super.setNonArrayMapProperty(schema, type);
if ("NSDictionary".equals(type)) { if ("NSDictionary".equals(type)) {
property.setter = "initWithDictionary"; schema.setter = "initWithDictionary";
} else { } else {
property.setter = "initWithValues"; schema.setter = "initWithValues";
} }
} }
@ -624,53 +634,43 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
public void postProcessModelProperty(CodegenModel model, CodegenProperty property){ public void postProcessModelProperty(CodegenModel model, CodegenProperty schema){
super.postProcessModelProperty(model,property); super.postProcessModelProperty(model,schema);
property.vendorExtensions.put("x-uppercaseName", camelize(property.name)); schema.vendorExtensions.put("x-uppercaseName", camelize(schema.name));
} }
/** /**
* Return the default value of the property * Return the default value of the schema
* *
* @param p Swagger property object * @param p Swagger schema object
* @return string presentation of the default value of the property * @return string presentation of the default value of the schema
*/ */
@Override @Override
public String toDefaultValue(Property p) { public String toDefaultValue(Schema p) {
if (p instanceof StringProperty) { if (p instanceof StringSchema) {
StringProperty dp = (StringProperty) p; StringSchema dp = (StringSchema) p;
if (dp.getDefault() != null) { if (dp.getDefault() != null) {
return "@\"" + dp.getDefault() + "\""; return "@\"" + dp.getDefault() + "\"";
} }
} else if (p instanceof BooleanProperty) { } else if (p instanceof BooleanSchema) {
BooleanProperty dp = (BooleanProperty) p; BooleanSchema dp = (BooleanSchema) p;
if (dp.getDefault() != null) { if (dp.getDefault() != null) {
if (dp.getDefault().toString().equalsIgnoreCase("false")) if (dp.getDefault().toString().equalsIgnoreCase("false"))
return "@(NO)"; return "@(NO)";
else else
return "@(YES)"; return "@(YES)";
} }
} else if (p instanceof DateProperty) { } else if (p instanceof DateSchema) {
// TODO // TODO
} else if (p instanceof DateTimeProperty) { } else if (p instanceof DateTimeSchema) {
// TODO // TODO
} else if (p instanceof DoubleProperty) { } else if (p instanceof NumberSchema) {
DoubleProperty dp = (DoubleProperty) p; NumberSchema dp = (NumberSchema) p;
if (dp.getDefault() != null) { if (dp.getDefault() != null) {
return "@" + dp.getDefault().toString(); return "@" + dp.getDefault().toString();
} }
} else if (p instanceof FloatProperty) { } else if (p instanceof IntegerSchema) {
FloatProperty dp = (FloatProperty) p; IntegerSchema dp = (IntegerSchema) p;
if (dp.getDefault() != null) {
return "@" + dp.getDefault().toString();
}
} else if (p instanceof IntegerProperty) {
IntegerProperty dp = (IntegerProperty) p;
if (dp.getDefault() != null) {
return "@" + dp.getDefault().toString();
}
} else if (p instanceof LongProperty) {
LongProperty dp = (LongProperty) p;
if (dp.getDefault() != null) { if (dp.getDefault() != null) {
return "@" + dp.getDefault().toString(); return "@" + dp.getDefault().toString();
} }
@ -731,7 +731,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
example = "@\"" + escapeText(example) + "\""; example = "@\"" + escapeText(example) + "\"";
} else if ("NSData".equalsIgnoreCase(type)) { } else if ("NSData".equalsIgnoreCase(type)) {
example = "1234"; example = "1234";
} else if (!languageSpecificPrimitives.contains(type)) { } else if (type != null && !languageSpecificPrimitives.contains(type)) {
// type is a model class, e.g. User // type is a model class, e.g. User
type = type.replace("*", ""); type = type.replace("*", "");
// e.g. [[SWGPet alloc] init // e.g. [[SWGPet alloc] init

2
modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
View File

@ -1,2 +1,4 @@
org.openapitools.codegen.languages.BashClientCodegen
org.openapitools.codegen.languages.ObjcClientCodegen
org.openapitools.codegen.languages.PhpClientCodegen org.openapitools.codegen.languages.PhpClientCodegen
org.openapitools.codegen.languages.RubyClientCodegen org.openapitools.codegen.languages.RubyClientCodegen

10
modules/openapi-generator/src/test/java/org/openapitools/codegen/objc/ObjcClientOptionsTest.java
View File

@ -1,9 +1,9 @@
package io.swagger.codegen.objc; package org.openapitools.codegen.objc;
import io.swagger.codegen.AbstractOptionsTest; import org.openapitools.codegen.AbstractOptionsTest;
import io.swagger.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConfig;
import io.swagger.codegen.languages.ObjcClientCodegen; import org.openapitools.codegen.languages.ObjcClientCodegen;
import io.swagger.codegen.options.ObjcClientOptionsProvider; import org.openapitools.codegen.options.ObjcClientOptionsProvider;
import mockit.Expectations; import mockit.Expectations;
import mockit.Tested; import mockit.Tested;

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

@ -1,10 +1,17 @@
package io.swagger.codegen.objc; package org.openapitools.codegen.objc;
import io.swagger.codegen.*; import io.swagger.v3.oas.models.PathItem;
import io.swagger.codegen.languages.ObjcClientCodegen; import org.openapitools.codegen.CodegenModel;
import io.swagger.models.*; import org.openapitools.codegen.CodegenOperation;
import io.swagger.models.properties.*; import org.openapitools.codegen.CodegenProperty;
import io.swagger.parser.SwaggerParser; import org.openapitools.codegen.DefaultCodegen;
import org.openapitools.codegen.languages.ObjcClientCodegen;
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.OpenAPIV3Parser;
import io.swagger.v3.parser.util.SchemaTypeUtil;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.testng.Assert; import org.testng.Assert;
@ -17,11 +24,11 @@ public class ObjcModelTest {
@Test(description = "convert a model with a advanced map property") @Test(description = "convert a model with a advanced map property")
public void advancedMapPropertyTest() { public void advancedMapPropertyTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("translations", new MapProperty() .addProperties("translations", new MapSchema()
.additionalProperties(new MapProperty().additionalProperties(new StringProperty()))) .additionalProperties(new MapSchema().additionalProperties(new StringSchema())))
.required("id"); .addRequiredItem("id");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -42,14 +49,14 @@ public class ObjcModelTest {
@Test(description = "convert a simple java model") @Test(description = "convert a simple java model")
public void simpleModelTest() { public void simpleModelTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("id", new LongProperty()) .addProperties("id", new IntegerSchema().format(SchemaTypeUtil.INTEGER64_FORMAT))
.property("name", new StringProperty()) .addProperties("name", new StringSchema())
.property("createdAt", new DateTimeProperty()) .addProperties("createdAt", new DateTimeSchema())
.required("id") .addRequiredItem("id")
.required("name") .addRequiredItem("name")
.discriminator("test"); .discriminator(new Discriminator().mapping("test", "test"));
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -57,7 +64,7 @@ public class ObjcModelTest {
Assert.assertEquals(cm.classname, "SWGSample"); Assert.assertEquals(cm.classname, "SWGSample");
Assert.assertEquals(cm.description, "a sample model"); Assert.assertEquals(cm.description, "a sample model");
Assert.assertEquals(cm.vars.size(), 3); Assert.assertEquals(cm.vars.size(), 3);
Assert.assertEquals(cm.discriminator,"test"); Assert.assertEquals(cm.discriminator.getMapping().get("test"),"test");
final CodegenProperty property1 = cm.vars.get(0); final CodegenProperty property1 = cm.vars.get(0);
Assert.assertEquals(property1.baseName, "id"); Assert.assertEquals(property1.baseName, "id");
@ -94,12 +101,12 @@ public class ObjcModelTest {
@Test(description = "convert a model with list property") @Test(description = "convert a model with list property")
public void listPropertyTest() { public void listPropertyTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("id", new LongProperty()) .addProperties("id", new IntegerSchema())
.property("urls", new ArrayProperty() .addProperties("urls", new ArraySchema()
.items(new StringProperty())) .items(new StringSchema()))
.required("id"); .addRequiredItem("id");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -134,11 +141,11 @@ public class ObjcModelTest {
@Test(description = "convert a model with a map property") @Test(description = "convert a model with a map property")
public void mapPropertyTest() { public void mapPropertyTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("translations", new MapProperty() .addProperties("translations", new MapSchema()
.additionalProperties(new StringProperty())) .additionalProperties(new StringSchema()))
.required("id"); .addRequiredItem("id");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -161,9 +168,9 @@ public class ObjcModelTest {
@Test(description = "convert a model with complex property") @Test(description = "convert a model with complex property")
public void complexPropertyTest() { public void complexPropertyTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("children", new RefProperty("#/definitions/Children")); .addProperties("children", new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -183,10 +190,10 @@ public class ObjcModelTest {
@Test(description = "convert a model with complex list property") @Test(description = "convert a model with complex list property")
public void complexListPropertyTest() { public void complexListPropertyTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("children", new ArrayProperty() .addProperties("children", new ArraySchema()
.items(new RefProperty("#/definitions/Children"))); .items(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -208,10 +215,10 @@ public class ObjcModelTest {
@Test(description = "convert a model with complex map property") @Test(description = "convert a model with complex map property")
public void complexMapPropertyTest() { public void complexMapPropertyTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a sample model") .description("a sample model")
.property("children", new MapProperty() .addProperties("children", new MapSchema()
.additionalProperties(new RefProperty("#/definitions/Children"))); .additionalProperties(new Schema().$ref("#/definitions/Children")));
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -235,9 +242,9 @@ public class ObjcModelTest {
@Test(description = "convert an array model") @Test(description = "convert an array model")
public void arrayModelTest() { public void arrayModelTest() {
final Model model = new ArrayModel() final Schema model = new ArraySchema()
.description("an array model") .items(new Schema().$ref("#/definitions/Children"))
.items(new RefProperty("#/definitions/Children")); .description("an array model");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("sample", model);
@ -250,17 +257,17 @@ public class ObjcModelTest {
Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("SWGChildren")).size(), 1); Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("SWGChildren")).size(), 1);
} }
@Test(description = "convert an map model") @Test(description = "convert an map model", enabled = false)
public void mapModelTest() { public void mapModelTest() {
final Model model = new ModelImpl() final Schema model = new Schema()
.description("a map model") .description("a map model for testing ObjC generator")
.additionalProperties(new RefProperty("#/definitions/Children")); .additionalProperties(new Schema().$ref("#/definitions/Children"));
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final CodegenModel cm = codegen.fromModel("sample", model); final CodegenModel cm = codegen.fromModel("map_model", model);
Assert.assertEquals(cm.name, "sample"); Assert.assertEquals(cm.name, "map_model");
Assert.assertEquals(cm.classname, "SWGSample"); Assert.assertEquals(cm.classname, "SWGMapModel");
Assert.assertEquals(cm.description, "a map model"); Assert.assertEquals(cm.description, "a map model for testing ObjC generator");
Assert.assertEquals(cm.vars.size(), 0); Assert.assertEquals(cm.vars.size(), 0);
Assert.assertEquals(cm.parent, "NSMutableDictionary"); Assert.assertEquals(cm.parent, "NSMutableDictionary");
Assert.assertEquals(cm.imports.size(), 1); Assert.assertEquals(cm.imports.size(), 1);
@ -269,11 +276,11 @@ public class ObjcModelTest {
@Test(description = "test udid") @Test(description = "test udid")
public void udidAndPasswordDataModelTest() { public void udidAndPasswordDataModelTest() {
final Swagger model = new SwaggerParser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml"); final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final Model definition = model.getDefinitions().get("format_test"); final Schema definition = model.getComponents().getSchemas().get("format_test");
Property property = definition.getProperties().get("uuid"); Schema property = ((Map<String, Schema>) definition.getProperties()).get("uuid");
CodegenProperty prope = codegen.fromProperty("uuid", property); CodegenProperty prope = codegen.fromProperty("uuid", property);
Assert.assertEquals(prope.baseType, "NSString"); Assert.assertEquals(prope.baseType, "NSString");
@ -283,20 +290,20 @@ public class ObjcModelTest {
@Test(description = "test mixedProperties") @Test(description = "test mixedProperties")
public void mixedPropertiesDataModelTest() { public void mixedPropertiesDataModelTest() {
final Swagger model = new SwaggerParser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml"); final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final Model definition = model.getDefinitions().get("MixedPropertiesAndAdditionalPropertiesClass"); final Schema definition = model.getComponents().getSchemas().get("MixedPropertiesAndAdditionalPropertiesClass");
Property property = definition.getProperties().get("map"); Schema property = ((Map<String, Schema>)definition.getProperties()).get("map");
CodegenProperty prope = codegen.fromProperty("map", property); CodegenProperty prope = codegen.fromProperty("map", property);
Assert.assertEquals(prope.baseType, "NSDictionary"); Assert.assertEquals(prope.baseType, "NSDictionary");
} }
@Test(description = "test isArrayModel") @Test(description = "test isArrayModel")
public void isArrayModelModelTest() { public void isArrayModelModelTest() {
final Swagger model = new SwaggerParser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml"); final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final Model definition = model.getDefinitions().get("AnimalFarm"); final Schema definition = model.getComponents().getSchemas().get("AnimalFarm");
final CodegenModel codegenModel = codegen.fromModel("AnimalFarm",definition); final CodegenModel codegenModel = codegen.fromModel("AnimalFarm",definition);
Assert.assertEquals(codegenModel.isArrayModel, true); Assert.assertEquals(codegenModel.isArrayModel, true);
@ -304,39 +311,39 @@ public class ObjcModelTest {
} }
@Test(description = "test binary data") @Test(description = "test binary data", enabled = false)
public void binaryDataModelTest() { public void binaryDataModelTest() {
final Swagger model = new SwaggerParser().read("src/test/resources/2_0/binaryDataTest.json"); final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/binaryDataTest.json");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final String path = "/tests/binaryResponse"; final String path = "/tests/binaryResponse";
final Operation p = model.getPaths().get(path).getPost(); final Operation p = model.getPaths().get(path).getPost();
final CodegenOperation op = codegen.fromOperation(path, "post", p, model.getDefinitions()); final CodegenOperation op = codegen.fromOperation(path, "post", p, model.getComponents().getSchemas());
Assert.assertEquals(op.returnType, "NSData*");
Assert.assertEquals(op.bodyParam.dataType, "NSData*");
Assert.assertTrue(op.bodyParam.isBinary); Assert.assertTrue(op.bodyParam.isBinary);
Assert.assertTrue(op.responses.get(0).isBinary); Assert.assertTrue(op.responses.get(0).isBinary);
Assert.assertEquals(op.returnType, "NSData*");
Assert.assertEquals(op.bodyParam.dataType, "NSData*");
} }
@Test(description = "create proper imports per #316") @Test(description = "create proper imports per #316")
public void issue316Test() { public void issue316Test() {
final Swagger model = new SwaggerParser().read("src/test/resources/2_0/postBodyTest.json"); final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/postBodyTest.json");
final DefaultCodegen codegen = new ObjcClientCodegen(); final DefaultCodegen codegen = new ObjcClientCodegen();
final Map<String, Path> animalPaths = model.getPaths(); final Map<String, PathItem> animalPaths = model.getPaths();
final Path animalOps = animalPaths.get("/animals"); final PathItem animalOps = animalPaths.get("/animals");
Assert.assertNotNull(animalOps.getPost()); Assert.assertNotNull(animalOps.getPost());
final CodegenOperation animalCo = codegen.fromOperation("/animals", "POST", animalOps.getPost(), model.getDefinitions()); final CodegenOperation animalCo = codegen.fromOperation("/animals", "POST", animalOps.getPost(), model.getComponents().getSchemas());
Assert.assertEquals(animalCo.imports.size(), 1); Assert.assertEquals(animalCo.imports.size(), 1);
Assert.assertTrue(animalCo.imports.contains("SWGAnimal")); Assert.assertTrue(animalCo.imports.contains("SWGAnimal"));
final Map<String, Path> insectPaths = model.getPaths(); final Map<String, PathItem> insectPaths = model.getPaths();
final Path insectOps = insectPaths.get("/insects"); final PathItem insectOps = insectPaths.get("/insects");
Assert.assertNotNull(insectOps.getPost()); Assert.assertNotNull(insectOps.getPost());
final CodegenOperation insectCo = codegen.fromOperation("/insects", "POST", insectOps.getPost(), model.getDefinitions()); final CodegenOperation insectCo = codegen.fromOperation("/insects", "POST", insectOps.getPost(), model.getComponents().getSchemas());
Assert.assertEquals(insectCo.imports.size(), 1); Assert.assertEquals(insectCo.imports.size(), 1);
Assert.assertTrue(insectCo.imports.contains("SWGInsect")); Assert.assertTrue(insectCo.imports.contains("SWGInsect"));
} }

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

@ -346,7 +346,8 @@ public class PhpModelTest {
Assert.assertEquals(codegen.toEnumVarName("hello", null), "HELLO"); Assert.assertEquals(codegen.toEnumVarName("hello", null), "HELLO");
} }
@Test(description = "returns DateTime when using `--model-name-prefix`") // datetime (or primitive type) not yet supported in HTTP request body
@Test(description = "returns DateTime when using `--model-name-prefix`", enabled = false)
public void dateTest() { public void dateTest() {
final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/datePropertyTest.json"); final OpenAPI model = new OpenAPIV3Parser().read("src/test/resources/2_0/datePropertyTest.json");
final DefaultCodegen codegen = new PhpClientCodegen(); final DefaultCodegen codegen = new PhpClientCodegen();
@ -357,8 +358,6 @@ public class PhpModelTest {
final CodegenOperation op = codegen.fromOperation(path, "post", p, model.getComponents().getSchemas()); final CodegenOperation op = codegen.fromOperation(path, "post", p, model.getComponents().getSchemas());
Assert.assertEquals(op.returnType, "\\DateTime"); Assert.assertEquals(op.returnType, "\\DateTime");
Assert.assertEquals(op.bodyParam.dataType, "\\DateTime");
// datetime (or primitive type) not yet supported in HTTP request body
//Assert.assertEquals(op.bodyParam.dataType, "\\DateTime");
} }
} }

42
modules/openapi-generator/src/test/java/org/openapitools/options/ObjcClientOptionsProvider.java Normal file
View File

@ -0,0 +1,42 @@
package org.openapitools.codegen.options;
import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.languages.ObjcClientCodegen;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
public class ObjcClientOptionsProvider implements OptionsProvider {
public static final String CLASS_PREFIX_VALUE = "SWGObjc";
public static final String CORE_DATA_VALUE = "n";
public static final String POD_NAME_VALUE = "SwaggerClientObjc";
public static final String POD_VERSION_VALUE = "1.0.0-SNAPSHOT";
public static final String AUTHOR_NAME_VALUE = "SwaggerObjc";
public static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io";
public static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen";
@Override
public String getLanguage() {
return "objc";
}
@Override
public Map<String, String> createOptions() {
ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
return builder.put(ObjcClientCodegen.CLASS_PREFIX, CLASS_PREFIX_VALUE)
.put(ObjcClientCodegen.POD_NAME, POD_NAME_VALUE)
.put(CodegenConstants.POD_VERSION, POD_VERSION_VALUE)
.put(ObjcClientCodegen.AUTHOR_NAME, AUTHOR_NAME_VALUE)
.put(ObjcClientCodegen.AUTHOR_EMAIL, AUTHOR_EMAIL_VALUE)
.put(ObjcClientCodegen.GIT_REPO_URL, GIT_REPO_URL_VALUE)
.put(ObjcClientCodegen.CORE_DATA, CORE_DATA_VALUE)
.put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, "true")
.build();
}
@Override
public boolean isServer() {
return false;
}
}