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

fixed build error

Browse Source
This commit is contained in:
Tony Tam
2016-02-04 18:06:59 -08:00
parent 5e80b61e3e
commit 9eb6993ccc
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
View File

@@ -5,15 +5,14 @@ import io.swagger.models.parameters.BodyParameter;
import io.swagger.models.parameters.Parameter;
import io.swagger.models.properties.*;
import io.swagger.util.Json;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class InlineModelResolver {
private Swagger swagger;
private boolean skipMatches;
@@ -294,7 +293,12 @@ public class InlineModelResolver {
@SuppressWarnings("static-method")
public Model modelFromProperty(ArrayProperty object, @SuppressWarnings("unused") String path) {
String description = object.getDescription();
String example = object.getExample();
String example = null;
Object obj = object.getExample();
if(obj != null) {
example = obj.toString();
}
Property inner = object.getItems();
if (inner instanceof ObjectProperty) {
ArrayModel model = new ArrayModel();
@@ -308,7 +312,12 @@ public class InlineModelResolver {
public Model modelFromProperty(ObjectProperty object, String path) {
String description = object.getDescription();
String example = object.getExample();
String example = null;
Object obj = object.getExample();
if(obj != null) {
example = obj.toString();
}
String name = object.getName();
Xml xml = object.getXml();
Map<String, Property> properties = object.getProperties();
@@ -330,7 +339,12 @@ public class InlineModelResolver {
@SuppressWarnings("static-method")
public Model modelFromProperty(MapProperty object, @SuppressWarnings("unused") String path) {
String description = object.getDescription();
String example = object.getExample();
String example = null;
Object obj = object.getExample();
if(obj != null) {
example = obj.toString();
}
ArrayModel model = new ArrayModel();
model.setDescription(description);

12
modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java
View File

@@ -170,37 +170,37 @@ public class XmlExampleGenerator {
protected String getExample(Property property) {
if (property instanceof DateTimeProperty) {
if (property.getExample() != null) {
return property.getExample();
return property.getExample().toString();
} else {
return dtFormat.format(new Date());
}
} else if (property instanceof StringProperty) {
if (property.getExample() != null) {
return property.getExample();
return property.getExample().toString();
} else {
return "string";
}
} else if (property instanceof DateProperty) {
if (property.getExample() != null) {
return property.getExample();
return property.getExample().toString();
} else {
return dateFormat.format(new Date());
}
} else if (property instanceof IntegerProperty) {
if (property.getExample() != null) {
return property.getExample();
return property.getExample().toString();
} else {
return "0";
}
} else if (property instanceof BooleanProperty) {
if (property.getExample() != null) {
return property.getExample();
return property.getExample().toString();
} else {
return "true";
}
} else if (property instanceof LongProperty) {
if (property.getExample() != null) {
return property.getExample();
return property.getExample().toString();
} else {
return "123456";
}