From c4f7c4f3f9a935abb3cc062e23e72d999d71a4db Mon Sep 17 00:00:00 2001 From: Elizabeth Thomas Date: Thu, 15 Jun 2017 00:59:21 -0500 Subject: [PATCH] Example Generator to populate model for all references of a given model (#5667) * Example Generator to populate model for all references of a given model * Fixing the space --- .../codegen/examples/ExampleGenerator.java | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java index 08d5065cfd6..067e0dde664 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java @@ -1,39 +1,17 @@ package io.swagger.codegen.examples; -import static io.swagger.models.properties.StringProperty.Format.URI; -import static io.swagger.models.properties.StringProperty.Format.URL; - import io.swagger.models.Model; import io.swagger.models.ModelImpl; -import io.swagger.models.properties.ArrayProperty; -import io.swagger.models.properties.BaseIntegerProperty; -import io.swagger.models.properties.BooleanProperty; -import io.swagger.models.properties.DateProperty; -import io.swagger.models.properties.DateTimeProperty; -import io.swagger.models.properties.DecimalProperty; -import io.swagger.models.properties.DoubleProperty; -import io.swagger.models.properties.FileProperty; -import io.swagger.models.properties.FloatProperty; -import io.swagger.models.properties.LongProperty; -import io.swagger.models.properties.MapProperty; -import io.swagger.models.properties.ObjectProperty; -import io.swagger.models.properties.Property; -import io.swagger.models.properties.RefProperty; -import io.swagger.models.properties.StringProperty; -import io.swagger.models.properties.UUIDProperty; +import io.swagger.models.properties.*; import io.swagger.util.Json; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; +import java.util.*; + +import static io.swagger.models.properties.StringProperty.Format.URI; +import static io.swagger.models.properties.StringProperty.Format.URL; public class ExampleGenerator { private static final Logger logger = LoggerFactory.getLogger(ExampleGenerator.class); @@ -203,7 +181,7 @@ public class ExampleGenerator { private Object resolveModelToExample(String name, String mediaType, Model model, Set processedModels) { if (processedModels.contains(name)) { - return ""; + return model.getExample(); } if (model instanceof ModelImpl) { processedModels.add(name); @@ -221,6 +199,7 @@ public class ExampleGenerator { Property property = impl.getProperties().get(propertyName); values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels)); } + impl.setExample(values); } return values; }