Merge branch '1.5' into 1.5

Author: frantuma

modules/swagger-models/src/main/java/io/swagger/models/Contact.java

@@ -1,9 +1,16 @@
 package io.swagger.models;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class Contact {
     private String name;
     private String url;
     private String email;
+    private Map<String, Object> vendorExtensions = new LinkedHashMap<String, Object>();
 
     public Contact name(String name) {
         this.setName(name);
@@ -44,13 +51,30 @@ public void setEmail(String email) {
         this.email = email;
     }
 
+    @JsonAnyGetter
+    public Map<String, Object> getVendorExtensions() {
+        return vendorExtensions;
+    }
+
+    @JsonAnySetter
+    public void setVendorExtension(String name, Object value) {
+        if (name.startsWith("x-")) {
+            vendorExtensions.put(name, value);
+        }
+    }
+
+    public void setVendorExtensions(Map<String, Object> vendorExtensions) {
+        this.vendorExtensions = vendorExtensions;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((email == null) ? 0 : email.hashCode());
         result = prime * result + ((name == null) ? 0 : name.hashCode());
         result = prime * result + ((url == null) ? 0 : url.hashCode());
+        result = prime * result + ((vendorExtensions == null) ? 0 : vendorExtensions.hashCode());
         return result;
     }
 
@@ -87,6 +111,13 @@ public boolean equals(Object obj) {
         } else if (!url.equals(other.url)) {
             return false;
         }
+        if (vendorExtensions == null) {
+            if (other.vendorExtensions != null) {
+                return false;
+            }
+        } else if (!vendorExtensions.equals(other.vendorExtensions)) {
+            return false;
+        }
         return true;
     }
 }