Fix CronTrigger equals/hashCode to include zoneId

Ensure CronTrigger instances with the same cron expression but different
time zones are no longer considered equal.

Author: zhaomeng

spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java

@@ -19,14 +19,14 @@
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.Objects;
 import java.util.TimeZone;
 
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;
 import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
 
 /**
  * {@link Trigger} implementation for cron expressions. Wraps a
@@ -147,12 +147,12 @@ Instant determineInitialTimestamp(TriggerContext triggerContext) {
 	public boolean equals(@Nullable Object other) {
 		return (this == other || (other instanceof CronTrigger that &&
 				this.expression.equals(that.expression) &&
-				ObjectUtils.nullSafeEquals(this.zoneId, that.zoneId)));
+				Objects.equals(this.zoneId, that.zoneId)));
 	}
 
 	@Override
 	public int hashCode() {
-		return ObjectUtils.nullSafeHash(this.expression, this.zoneId);
+		return Objects.hash(this.expression, this.zoneId);
 	}
 
 	@Override

spring-context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java

@@ -748,7 +748,7 @@ void daylightSavingMissingHour() {
 	}
 
 	@Test
-	void equalsAndHashCodeConsidersZoneId() {
+	void equalsAndHashCodeConsiderZoneId() {
 		String cron = "0 0 9 * * *";
 		CronTrigger amsterdam = new CronTrigger(cron, ZoneId.of("Europe/Amsterdam"));
 		CronTrigger newYork = new CronTrigger(cron, ZoneId.of("America/New_York"));