You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2021/02/01 21:02:28 UTC

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #5482: TR: Fix potential steering registry race, improve steering logging

zrhoffman commented on a change in pull request #5482:
URL: https://github.com/apache/trafficcontrol/pull/5482#discussion_r568117983



##########
File path: traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/Steering.java
##########
@@ -83,17 +84,23 @@ public boolean hasTarget(final String deliveryService) {
 	}
 
 	@Override
-	@SuppressWarnings("PMD")
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
+	public boolean equals(final Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
 
-		Steering steering = (Steering) o;
+		final Steering steering = (Steering) o;
 
-		if (deliveryService != null ? !deliveryService.equals(steering.deliveryService) : steering.deliveryService != null)
+		if (!Objects.equals(deliveryService, steering.deliveryService)) {
 			return false;
-		if (targets != null ? !targets.equals(steering.targets) : steering.targets != null) return false;
-		return filters != null ? filters.equals(steering.filters) : steering.filters == null;
+		}
+		if (!Objects.equals(targets, steering.targets)) {
+			return false;
+		}
+		return Objects.equals(filters, steering.filters);

Review comment:
       This can be simplified:
   ```java
   return Objects.equals(deliveryService, steering.deliveryService) && Objects.equals(targets, steering.targets) && Objects.equals(filters, steering.filters);
   ```




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org