From 9eb6993ccc2477b1d982dc6bc18a9f370d39763e Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 4 Feb 2016 18:06:59 -0800 Subject: [PATCH] fixed build error --- .../swagger/codegen/InlineModelResolver.java | 26 ++++++++++++++----- .../codegen/examples/XmlExampleGenerator.java | 12 ++++----- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java index bd22f40616b9..02bf82572e05 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java @@ -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 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); diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java index ec77888ec25b..54f022ad1247 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java @@ -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"; }