Changed the xml name to default to the model name when missing

dilipkrish · dilipkrish · commit ef610712af29 · 2017-09-17T19:53:36.000-05:00
(1907)
diff --git a/springfox-core/src/main/java/springfox/documentation/builders/ModelBuilder.java b/springfox-core/src/main/java/springfox/documentation/builders/ModelBuilder.java
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.google.common.base.Strings.*;
 import static com.google.common.collect.Lists.*;
 import static com.google.common.collect.Maps.*;
 import static springfox.documentation.builders.BuilderDefaults.*;
@@ -163,6 +164,9 @@ public ModelBuilder xml(Xml xml) {
   }
 
   public Model build() {
+    if (xml != null && isNullOrEmpty(xml.getName())) {
+      xml.setName(name);
+    }
     return new Model(
         id,
         name,
diff --git a/springfox-core/src/main/java/springfox/documentation/builders/ModelPropertyBuilder.java b/springfox-core/src/main/java/springfox/documentation/builders/ModelPropertyBuilder.java
@@ -27,6 +27,7 @@
 
 import java.util.List;
 
+import static com.google.common.base.Strings.*;
 import static com.google.common.collect.Lists.*;
 import static springfox.documentation.builders.BuilderDefaults.*;
 
@@ -87,7 +88,7 @@ public ModelPropertyBuilder example(String example) {
   }
 
   public ModelPropertyBuilder allowableValues(AllowableValues allowableValues) {
-    this.allowableValues = emptyToNull(allowableValues, this.allowableValues);
+    this.allowableValues = BuilderDefaults.emptyToNull(allowableValues, this.allowableValues);
     return this;
   }
 
@@ -117,6 +118,9 @@ public ModelPropertyBuilder xml(Xml xml) {
   }
 
   public ModelProperty build() {
+    if (xml != null && isNullOrEmpty(xml.getName())) {
+      xml.setName(name);
+    }
     return new ModelProperty(
         name,
         type,

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`
`28`	`28`	`import java.util.List;`
`29`	`29`
	`30`	`+import static com.google.common.base.Strings.*;`
`30`	`31`	`import static com.google.common.collect.Lists.*;`
`31`	`32`	`import static springfox.documentation.builders.BuilderDefaults.*;`
`32`	`33`
`@@ -87,7 +88,7 @@ public ModelPropertyBuilder example(String example) {`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`public ModelPropertyBuilder allowableValues(AllowableValues allowableValues) {`
`90`		`- this.allowableValues = emptyToNull(allowableValues, this.allowableValues);`
	`91`	`+ this.allowableValues = BuilderDefaults.emptyToNull(allowableValues, this.allowableValues);`
`91`	`92`	`return this;`
`92`	`93`	`}`
`93`	`94`
`@@ -117,6 +118,9 @@ public ModelPropertyBuilder xml(Xml xml) {`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`public ModelProperty build() {`
	`121`	`+ if (xml != null && isNullOrEmpty(xml.getName())) {`
	`122`	`+ xml.setName(name);`
	`123`	`+ }`
`120`	`124`	`return new ModelProperty(`
`121`	`125`	`name,`
`122`	`126`	`type,`