Fix bugs detected by error prone

thelastpickle · Sep 30, 2017 · 3f4f09e · 3f4f09e
1 parent 354fe59
commit 3f4f09e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/server/src/main/java/io/cassandrareaper/core/RepairRun.java b/src/server/src/main/java/io/cassandrareaper/core/RepairRun.java
@@ -145,7 +145,7 @@ public boolean equals(Object other) {
       return false;
     }
     RepairRun run = (RepairRun) other;
-    return this.id == run.id && this.repairUnitId == run.repairUnitId;
+    return this.id.equals(run.id) && this.repairUnitId.equals(run.repairUnitId);
   }
 
   @Override

diff --git a/src/server/src/main/java/io/cassandrareaper/resources/CommonTools.java b/src/server/src/main/java/io/cassandrareaper/resources/CommonTools.java
@@ -362,10 +362,15 @@ public static RepairSchedule storeNewRepairSchedule(
   }
 
   private static boolean isConflictingSchedules(RepairUnit newRepairUnit, RepairUnit existingRepairUnit) {
-    return (newRepairUnit.getColumnFamilies().isEmpty() && existingRepairUnit.getColumnFamilies().isEmpty())
-        || newRepairUnit.getColumnFamilies().isEmpty() && !existingRepairUnit.getColumnFamilies().isEmpty()
-        || !newRepairUnit.getColumnFamilies().isEmpty() && existingRepairUnit.getColumnFamilies().isEmpty()
-        || !Sets.intersection(existingRepairUnit.getColumnFamilies(), newRepairUnit.getColumnFamilies()).isEmpty();
+    return (newRepairUnit.getColumnFamilies().isEmpty()
+            && existingRepairUnit.getColumnFamilies().isEmpty())
+        || (newRepairUnit.getColumnFamilies().isEmpty()
+            && !existingRepairUnit.getColumnFamilies().isEmpty())
+        || (!newRepairUnit.getColumnFamilies().isEmpty()
+            && existingRepairUnit.getColumnFamilies().isEmpty())
+        || (!Sets.intersection(
+                existingRepairUnit.getColumnFamilies(), newRepairUnit.getColumnFamilies())
+            .isEmpty());
   }
 
   public static Set<String> getTableNamesBasedOnParam(

diff --git a/src/server/src/main/java/io/cassandrareaper/resources/view/NodesStatus.java b/src/server/src/main/java/io/cassandrareaper/resources/view/NodesStatus.java
@@ -166,7 +166,7 @@ private static void initPatterns() {
     ENDPOINT_TOKENS_PATTERNS.add(ENDPOINT_TOKENS_22_PATTERN);
   }
 
-  public final class GossipInfo {
+  public static final class GossipInfo {
 
     @JsonProperty
     public final String sourceNode;
@@ -193,7 +193,7 @@ public GossipInfo(
     }
   }
 
-  public final class EndpointState {
+  public static final class EndpointState {
 
     @JsonProperty
     public final String endpoint;