fix #719

swagger-api · Jun 10, 2018 · 392c4c9 · 392c4c9
1 parent 8708f1b
commit 392c4c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/modules/swagger-models/src/main/java/io/swagger/models/Paths.java b/modules/swagger-models/src/main/java/io/swagger/models/Paths.java
@@ -30,7 +30,7 @@ public boolean equals(java.lang.Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(vendorExtensions, super.hashCode());
+        return Objects.hash(super.hashCode(), vendorExtensions);
     }
 
     public java.util.Map<String, Object> getVendorExtensions() {
@@ -61,6 +61,7 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class Paths {\n");
         sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+        sb.append("    vendorExtensions: ").append(toIndentedString(vendorExtensions)).append("\n");
         sb.append("}");
         return sb.toString();
     }

diff --git a/modules/swagger-models/src/main/java/io/swagger/models/Responses.java b/modules/swagger-models/src/main/java/io/swagger/models/Responses.java
@@ -6,33 +6,13 @@
 
 public class Responses extends LinkedHashMap<String, Response> {
 
-    public static final String DEFAULT = "default";
-
     private java.util.Map<String, Object> vendorExtensions = null;
 
     public Responses addResponse(String name, Response item) {
         this.put(name, item);
         return this;
     }
 
-    /**
-     * returns the default property from a ApiResponses instance.
-     *
-     * @return ApiResponse _default
-     **/
-
-    public Response getDefault() {
-        return this.get(DEFAULT);
-    }
-
-    public void setDefault(Response _default) {
-        addResponse(DEFAULT, _default);
-    }
-
-    public Responses _default(Response _default) {
-        setDefault(_default);
-        return this;
-    }
 
     public java.util.Map<String, Object> getVendorExtensions() {
         return vendorExtensions;
@@ -69,8 +49,9 @@ public boolean equals(java.lang.Object o) {
         if (!super.equals(o)) {
             return false;
         }
-        Responses apiResponses = (Responses) o;
-        return Objects.equals(this.vendorExtensions, apiResponses.vendorExtensions);
+        Responses responses = (Responses) o;
+        return Objects.equals(this.vendorExtensions, responses.vendorExtensions) &&
+                super.equals(o);
     }
 
     @Override
@@ -81,7 +62,7 @@ public int hashCode() {
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("class ApiResponses {\n");
+        sb.append("class Responses {\n");
         sb.append("    ").append(toIndentedString(super.toString())).append("\n");
         sb.append("    vendorExtensions: ").append(toIndentedString(vendorExtensions)).append("\n");
         sb.append("}");

diff --git a/modules/swagger-models/src/test/java/io/swagger/PojosTest.java b/modules/swagger-models/src/test/java/io/swagger/PojosTest.java
@@ -102,10 +102,11 @@ public void testEqualsAndHashcodes() throws InstantiationException, IllegalAcces
         classesExclusions.put(RefModel.class, new HashSet<String>(Arrays.asList("title")));
         classesExclusions.put(RefResponse.class,
                 new HashSet<String>(Arrays.asList("headers", "schema")));
+
 
         Set<Class<?>> classesUsingInheritedFields = new HashSet<Class<?>>(Arrays.asList(ApiKeyAuthDefinition.class,
                 BodyParameter.class, ArrayProperty.class, BaseIntegerProperty.class, CookieParameter.class));
-        Set<Class<?>> excludedClasses = new HashSet<Class<?>>(Arrays.asList(PropertyBuilder.class));
+        Set<Class<?>> excludedClasses = new HashSet<Class<?>>(Arrays.asList(PropertyBuilder.class,Responses.class,Paths.class));
         for (PojoClass clazz : pojoClasses) {
             if (excludedClasses.contains(clazz.getClazz()))
                 continue;