From 67554442537c0fb51d68d47b27f2ae75ccdab723 Mon Sep 17 00:00:00 2001
From: Joshua Helm <jhelm@simpfony.com>
Date: Sun, 29 Jan 2017 15:19:47 -0500
Subject: [PATCH 1/2] fix issue #4672 and bring XML default example values
 in-line with ExampleGenerator

---
 .../codegen/examples/XmlExampleGenerator.java | 89 ++++++++++---------
 .../swagger/codegen/ExampleGeneratorTest.java |  4 +-
 2 files changed, 51 insertions(+), 42 deletions(-)

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 ed9ab123354..f2195d7ecec 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
@@ -9,13 +9,22 @@
 import io.swagger.models.properties.BooleanProperty;
 import io.swagger.models.properties.DateProperty;
 import io.swagger.models.properties.DateTimeProperty;
-import io.swagger.models.properties.IntegerProperty;
 import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.DecimalProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.BaseIntegerProperty;
+import io.swagger.models.properties.AbstractNumericProperty;
+import io.swagger.models.properties.PasswordProperty;
+import io.swagger.models.properties.UUIDProperty;
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.RefProperty;
 import io.swagger.models.properties.StringProperty;
+
 import org.codehaus.plexus.util.StringUtils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,6 +34,7 @@
 import java.util.Set;
 
 public class XmlExampleGenerator {
+	protected final Logger LOGGER = LoggerFactory.getLogger(XmlExampleGenerator.class);
     public static String NEWLINE = "\n";
     public static String TAG_START = "<";
     public static String CLOSE_TAG = ">";
@@ -163,45 +173,44 @@ protected String toXml(String name, Property property, int indent, Collection<St
         return sb.toString();
     }
 
-    protected String getExample(Property property) {
-        if (property instanceof DateTimeProperty) {
-            if (property.getExample() != null) {
-                return property.getExample().toString();
-            } else {
-                return "2000-01-23T04:56:07.000Z";
-            }
-        } else if (property instanceof StringProperty) {
-            if (property.getExample() != null) {
-                return property.getExample().toString();
-            } else {
-                return "string";
-            }
-        } else if (property instanceof DateProperty) {
-            if (property.getExample() != null) {
-                return property.getExample().toString();
-            } else {
-                return "2000-01-23";
-            }
-        } else if (property instanceof IntegerProperty) {
-            if (property.getExample() != null) {
-                return property.getExample().toString();
-            } else {
-                return "0";
-            }
-        } else if (property instanceof BooleanProperty) {
-            if (property.getExample() != null) {
-                return property.getExample().toString();
-            } else {
-                return "true";
-            }
-        } else if (property instanceof LongProperty) {
-            if (property.getExample() != null) {
-                return property.getExample().toString();
-            } else {
-                return "123456";
-            }
-        }
-        return "not implemented " + property;
+	/**
+	* Get the example string value for the given Property.
+	*
+	* If an example value was not provided in the specification, a default will be generated.
+	*
+	* @param	property	Property to get example string for
+	*
+	* @return Example String
+	*/
+	protected String getExample(Property property) {
+		if (property.getExample() != null) {
+			return property.getExample().toString();
+		} else if (property instanceof DateTimeProperty) {
+			return "2000-01-23T04:56:07.000Z";
+		} else if (property instanceof DateProperty) {
+			return "2000-01-23";
+		} else if (property instanceof BooleanProperty) {
+			return "true";
+		} else if (property instanceof LongProperty) {
+			return "123456789";
+		} else if (property instanceof DoubleProperty) {	// derived from DecimalProperty so make sure this is first
+			return "3.149";
+		}  else if (property instanceof DecimalProperty) {
+			return "1.3579";
+		} else if (property instanceof PasswordProperty) {
+			return "********";
+		} else if (property instanceof UUIDProperty) {
+			return "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
+		// do these last in case the specific types above are derived from these classes
+		} else if (property instanceof StringProperty) {
+			return "aeiou";
+		} else if (property instanceof BaseIntegerProperty) {
+			return "123";
+		} else if (property instanceof AbstractNumericProperty) {
+			return "1.23";
+		}
+		LOGGER.warn("default example value not implemented for " + property);
+		return "";
     }
 
     @SuppressWarnings("static-method")
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java
index d4c22b88aad..ab50384e883 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/ExampleGeneratorTest.java
@@ -50,12 +50,12 @@ public void recursiveModelsTest() {
                 types.add(XML);
                 Assert.assertEquals(example, "<Pair>\n" +
                         "  <Node>\n" +
-                        "    <name>string</name>\n" +
+                        "    <name>aeiou</name>\n" +
                         "    <wrappedChildren>\n" +
                         "    </wrappedChildren>\n" +
                         "  </Node>\n" +
                         "  <Node>\n" +
-                        "    <name>string</name>\n" +
+                        "    <name>aeiou</name>\n" +
                         "    <wrappedChildren>\n" +
                         "    </wrappedChildren>\n" +
                         "  </Node>\n" +

From dba8499f99a134f23588f9cbf2755eb9e6e432bf Mon Sep 17 00:00:00 2001
From: Joshua Helm <jhelm@simpfony.com>
Date: Sat, 4 Feb 2017 09:00:11 -0500
Subject: [PATCH 2/2] converted tabs to spaces

---
 .../codegen/examples/XmlExampleGenerator.java | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

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 f2195d7ecec..c59449be439 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
@@ -34,7 +34,7 @@
 import java.util.Set;
 
 public class XmlExampleGenerator {
-	protected final Logger LOGGER = LoggerFactory.getLogger(XmlExampleGenerator.class);
+    protected final Logger LOGGER = LoggerFactory.getLogger(XmlExampleGenerator.class);
     public static String NEWLINE = "\n";
     public static String TAG_START = "<";
     public static String CLOSE_TAG = ">";
@@ -173,44 +173,44 @@ protected String toXml(String name, Property property, int indent, Collection<St
         return sb.toString();
     }
 
-	/**
-	* Get the example string value for the given Property.
-	*
-	* If an example value was not provided in the specification, a default will be generated.
-	*
-	* @param	property	Property to get example string for
-	*
-	* @return Example String
-	*/
-	protected String getExample(Property property) {
-		if (property.getExample() != null) {
-			return property.getExample().toString();
-		} else if (property instanceof DateTimeProperty) {
-			return "2000-01-23T04:56:07.000Z";
-		} else if (property instanceof DateProperty) {
-			return "2000-01-23";
-		} else if (property instanceof BooleanProperty) {
-			return "true";
-		} else if (property instanceof LongProperty) {
-			return "123456789";
-		} else if (property instanceof DoubleProperty) {	// derived from DecimalProperty so make sure this is first
-			return "3.149";
-		}  else if (property instanceof DecimalProperty) {
-			return "1.3579";
-		} else if (property instanceof PasswordProperty) {
-			return "********";
-		} else if (property instanceof UUIDProperty) {
-			return "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
-		// do these last in case the specific types above are derived from these classes
-		} else if (property instanceof StringProperty) {
-			return "aeiou";
-		} else if (property instanceof BaseIntegerProperty) {
-			return "123";
-		} else if (property instanceof AbstractNumericProperty) {
-			return "1.23";
-		}
-		LOGGER.warn("default example value not implemented for " + property);
-		return "";
+    /**
+    * Get the example string value for the given Property.
+    *
+    * If an example value was not provided in the specification, a default will be generated.
+    *
+    * @param property Property to get example string for
+    *
+    * @return Example String
+    */
+    protected String getExample(Property property) {
+        if (property.getExample() != null) {
+            return property.getExample().toString();
+        } else if (property instanceof DateTimeProperty) {
+            return "2000-01-23T04:56:07.000Z";
+        } else if (property instanceof DateProperty) {
+            return "2000-01-23";
+        } else if (property instanceof BooleanProperty) {
+            return "true";
+        } else if (property instanceof LongProperty) {
+            return "123456789";
+        } else if (property instanceof DoubleProperty) { // derived from DecimalProperty so make sure this is first
+            return "3.149";
+        }  else if (property instanceof DecimalProperty) {
+            return "1.3579";
+        } else if (property instanceof PasswordProperty) {
+            return "********";
+        } else if (property instanceof UUIDProperty) {
+            return "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
+        // do these last in case the specific types above are derived from these classes
+        } else if (property instanceof StringProperty) {
+            return "aeiou";
+        } else if (property instanceof BaseIntegerProperty) {
+            return "123";
+        } else if (property instanceof AbstractNumericProperty) {
+            return "1.23";
+        }
+        LOGGER.warn("default example value not implemented for " + property);
+        return "";
     }
 
     @SuppressWarnings("static-method")