address PR feedback

vam-google · vam-google · commit 84b542e125f4 · 2021-06-18T17:09:23.000-07:00
diff --git a/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java b/src/main/java/com/google/api/generator/gapic/model/HttpBindings.java
@@ -39,9 +39,11 @@ public static HttpBinding create(String name, boolean isOptional) {
       return new AutoValue_HttpBindings_HttpBinding(name, isOptional);
     }
 
+    // Do not forget to keep it in sync with equals() implementation.
     @Override
     public int compareTo(HttpBinding o) {
-      return name().compareTo(o.name());
+      int res = name().compareTo(o.name());
+      return res == 0 ? Boolean.compare(isOptional(), o.isOptional()) : res;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,11 @@ public static HttpBinding create(String name, boolean isOptional) {`
`39`	`39`	`return new AutoValue_HttpBindings_HttpBinding(name, isOptional);`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ // Do not forget to keep it in sync with equals() implementation.`
`42`	`43`	`@Override`
`43`	`44`	`public int compareTo(HttpBinding o) {`
`44`		`- return name().compareTo(o.name());`
	`45`	`+ int res = name().compareTo(o.name());`
	`46`	`+ return res == 0 ? Boolean.compare(isOptional(), o.isOptional()) : res;`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`