Merge pull request #8748 from swagger-api/issue-8734

refactor changes related to #8712 in order to solve maven build fail.

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -2191,7 +2191,7 @@ public CodegenOperation fromOperation(String path,
                             op.returnBaseType = cm.baseType;
                         }
                     }
-                    op.examples = new ExampleGenerator(definitions).generate(methodResponse.getExamples(), operation.getProduces(), responseProperty);
+                    op.examples = getExamples(definitions, methodResponse.getExamples(), operation.getProduces(), responseProperty);
                     op.defaultResponse = toDefaultValue(responseProperty);
                     op.returnType = cm.datatype;
                     op.hasReference = definitions != null && definitions.containsKey(op.returnBaseType);
@@ -2272,7 +2272,7 @@ public CodegenOperation fromOperation(String path,
                     bodyParam = p;
                     bodyParams.add(p.copy());
                     if(definitions != null) {
-                        op.requestBodyExamples = new ExampleGenerator(definitions).generate(null, operation.getConsumes(), bodyParam.dataType);
+                        op.requestBodyExamples = getExamples(definitions, null, consumes, bodyParam.dataType);
                     }
                 } else if (param instanceof FormParameter) {
                     formParams.add(p.copy());
@@ -3816,6 +3816,15 @@ public boolean convertPropertyToBoolean(String propertyKey) {
         return booleanValue;
     }
 
+    protected List<Map<String, String>> getExamples(Map<String, Model> definitions, Map<String, Object> examples, List<String> mediaTypes, Object object) {
+        if (object instanceof Property) {
+            Property responseProperty = (Property) object;
+            return new ExampleGenerator(definitions).generate(examples, mediaTypes, responseProperty);
+        }
+        // this must be a model name instead
+        return new ExampleGenerator(definitions).generate(examples, mediaTypes, object.toString());
+    }
+
     public void writePropertyBack(String propertyKey, boolean value) {
         additionalProperties.put(propertyKey, value);
     }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java

@@ -1,9 +1,13 @@
 package io.swagger.codegen.languages;
 
 import java.io.File;
+import java.util.List;
+import java.util.Map;
 
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.models.Model;
+import io.swagger.models.properties.Property;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -35,8 +39,6 @@ public SwaggerGenerator() {
                 "output filename")
                 .defaultValue(SWAGGER_FILENAME_DEFAULT_JSON));
         supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
-
-        System.setProperty(CodegenConstants.SUPPORTING_FILES, Boolean.TRUE.toString());
     }
 
     @Override
@@ -84,7 +86,15 @@ public void setOutputFile(String outputFile) {
     public String escapeQuotationMark(String input) { 
         // just return the original string
         return input;
-    } 
+    }
+
+    @Override
+    protected List<Map<String, String>> getExamples(Map<String, Model> definitions, Map<String, Object> examples, List<String> produces, Object object) {
+        if (examples == null || examples.isEmpty()) {
+            return null;
+        }
+        return super.getExamples(definitions, examples, produces, object);
+    }
 
     @Override
     public String escapeUnsafeCharacters(String input) { 

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java

@@ -8,9 +8,12 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
 import io.swagger.codegen.*;
+import io.swagger.codegen.examples.ExampleGenerator;
 import io.swagger.jackson.mixin.ResponseSchemaMixin;
+import io.swagger.models.Model;
 import io.swagger.models.Response;
 import io.swagger.models.Swagger;
+import io.swagger.models.properties.Property;
 import io.swagger.util.DeserializationModule;
 import io.swagger.util.Yaml;
 import org.apache.commons.io.FileUtils;
@@ -19,6 +22,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.util.List;
+import java.util.Map;
 
 public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig {
 
@@ -41,8 +46,6 @@ public SwaggerYamlGenerator() {
                 .defaultValue(SWAGGER_FILENAME_DEFAULT_YAML));
 
         supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
-
-        System.setProperty(CodegenConstants.SUPPORTING_FILES, Boolean.TRUE.toString());
     }
 
     @Override
@@ -99,7 +102,15 @@ public String escapeQuotationMark(String input) {
     public String escapeUnsafeCharacters(String input) {
         // just return the original string
         return input;
-    }   
+    }
+
+    @Override
+    protected List<Map<String, String>> getExamples(Map<String, Model> definitions, Map<String, Object> examples, List<String> produces, Object object) {
+        if (examples == null || examples.isEmpty()) {
+            return null;
+        }
+        return super.getExamples(definitions, examples, produces, object);
+    }
 
     private void configureMapper(ObjectMapper mapper) {
         Module deserializerModule = new DeserializationModule(true, true);

modules/swagger-codegen/src/test/java/io/swagger/codegen/ruby/RubyClientCodegenTest.java

@@ -32,9 +32,6 @@ public class RubyClientCodegenTest {
   @BeforeMethod
   public void setUp() throws Exception {
       folder.create();
-      if (System.getProperty(CodegenConstants.SUPPORTING_FILES) != null) {
-          System.clearProperty(CodegenConstants.SUPPORTING_FILES);
-      }
   }
 
   @AfterMethod