Simplify compareReportsBySeverity

adutra · adutra · commit b77940407db8 · 2020-04-21T10:32:44.000+02:00
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/diagnostic/ring/DefaultTokenRingDiagnostic.java b/core/src/main/java/com/datastax/oss/driver/internal/core/metadata/diagnostic/ring/DefaultTokenRingDiagnostic.java
@@ -160,8 +160,6 @@ private int compareReportsBySeverity(
     int severity1 = diagnostic1.getAliveReplicas() - diagnostic1.getRequiredReplicas();
     int severity2 = diagnostic2.getAliveReplicas() - diagnostic2.getRequiredReplicas();
     int result = Integer.compare(severity1, severity2);
-    return (result == 0)
-        ? diagnostic1.getTokenRange().compareTo(diagnostic2.getTokenRange())
-        : result;
+    return (result == 0) ? diagnostic1.compareTo(diagnostic2) : result;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,6 @@ private int compareReportsBySeverity(`
`160`	`160`	`int severity1 = diagnostic1.getAliveReplicas() - diagnostic1.getRequiredReplicas();`
`161`	`161`	`int severity2 = diagnostic2.getAliveReplicas() - diagnostic2.getRequiredReplicas();`
`162`	`162`	`int result = Integer.compare(severity1, severity2);`
`163`		`- return (result == 0)`
`164`		`- ? diagnostic1.getTokenRange().compareTo(diagnostic2.getTokenRange())`
`165`		`- : result;`
	`163`	`+ return (result == 0) ? diagnostic1.compareTo(diagnostic2) : result;`
`166`	`164`	`}`
`167`	`165`	`}`