8263668: Update java.time to use instanceof pattern variable

Reviewed-by: lancea, ryadav, naoto, rriggs, dfuchs, scolebourne, chegar

src/java.base/share/classes/java/time/Clock.java

@@ -730,11 +730,9 @@ public abstract class Clock {
         }
         @Override
         public boolean equals(Object obj) {
-            if (obj instanceof TickClock) {
+            return (obj instanceof TickClock other)
-                TickClock other = (TickClock) obj;
+                    && tickNanos == other.tickNanos
-                return baseClock.equals(other.baseClock) && tickNanos == other.tickNanos;
+                    && baseClock.equals(other.baseClock);
-            }
-            return false;
         }
         @Override
         public int hashCode() {

src/java.base/share/classes/java/time/Duration.java

@@ -719,8 +719,8 @@ public final class Duration
         if (amountToAdd == 0) {
             return this;
         }
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case NANOS: return plusNanos(amountToAdd);
                 case MICROS: return plusSeconds((amountToAdd / (1000_000L * 1000)) * 1000).plusNanos((amountToAdd % (1000_000L * 1000)) * 1000);
                 case MILLIS: return plusMillis(amountToAdd);
@@ -1421,20 +1421,17 @@ public final class Duration
      * <p>
      * The comparison is based on the total length of the durations.
      *
-     * @param otherDuration the other duration, null returns false
+     * @param other the other duration, null returns false
      * @return true if the other duration is equal to this one
      */
     @Override
-    public boolean equals(Object otherDuration) {
+    public boolean equals(Object other) {
-        if (this == otherDuration) {
+        if (this == other) {
             return true;
         }
-        if (otherDuration instanceof Duration) {
+        return (other instanceof Duration otherDuration)
-            Duration other = (Duration) otherDuration;
+                && this.seconds == otherDuration.seconds
-            return this.seconds == other.seconds &&
+                && this.nanos == otherDuration.nanos;
-                   this.nanos == other.nanos;
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/Instant.java

@@ -1292,20 +1292,17 @@ public final class Instant
      * <p>
      * The comparison is based on the time-line position of the instants.
      *
-     * @param otherInstant  the other instant, null returns false
+     * @param other  the other instant, null returns false
      * @return true if the other instant is equal to this one
      */
     @Override
-    public boolean equals(Object otherInstant) {
+    public boolean equals(Object other) {
-        if (this == otherInstant) {
+        if (this == other) {
             return true;
         }
-        if (otherInstant instanceof Instant) {
+        return (other instanceof Instant otherInstant)
-            Instant other = (Instant) otherInstant;
+                && this.seconds == otherInstant.seconds
-            return this.seconds == other.seconds &&
+                && this.nanos == otherInstant.nanos;
-                   this.nanos == other.nanos;
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/LocalDate.java

@@ -1940,7 +1940,7 @@ public final class LocalDate
         // need to handle case where there is a gap from 11:30 to 00:30
         // standard ZDT factory would result in 01:00 rather than 00:30
         LocalDateTime ldt = atTime(LocalTime.MIDNIGHT);
-        if (zone instanceof ZoneOffset == false) {
+        if (!(zone instanceof ZoneOffset)) {
             ZoneRules rules = zone.getRules();
             ZoneOffsetTransition trans = rules.getTransition(ldt);
             if (trans != null && trans.isGap()) {

src/java.base/share/classes/java/time/LocalDateTime.java

@@ -1683,7 +1683,7 @@ public final class LocalDateTime
     @Override
     public long until(Temporal endExclusive, TemporalUnit unit) {
         LocalDateTime end = LocalDateTime.from(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
             if (unit.isTimeBased()) {
                 long amount = date.daysUntil(end.date);
                 if (amount == 0) {
@@ -1697,7 +1697,7 @@ public final class LocalDateTime
                     amount++;  // safe
                     timePart -= NANOS_PER_DAY;  // safe
                 }
-                switch ((ChronoUnit) unit) {
+                switch (chronoUnit) {
                     case NANOS:
                         amount = Math.multiplyExact(amount, NANOS_PER_DAY);
                         break;
@@ -1935,11 +1935,9 @@ public final class LocalDateTime
         if (this == obj) {
             return true;
         }
-        if (obj instanceof LocalDateTime) {
+        return (obj instanceof LocalDateTime other)
-            LocalDateTime other = (LocalDateTime) obj;
+                && date.equals(other.date)
-            return date.equals(other.date) && time.equals(other.time);
+                && time.equals(other.time);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/LocalTime.java

@@ -1066,8 +1066,8 @@ public final class LocalTime
      */
     @Override
     public LocalTime plus(long amountToAdd, TemporalUnit unit) {
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case NANOS: return plusNanos(amountToAdd);
                 case MICROS: return plusNanos((amountToAdd % MICROS_PER_DAY) * 1000);
                 case MILLIS: return plusNanos((amountToAdd % MILLIS_PER_DAY) * 1000_000);
@@ -1407,9 +1407,9 @@ public final class LocalTime
     @Override
     public long until(Temporal endExclusive, TemporalUnit unit) {
         LocalTime end = LocalTime.from(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
             long nanosUntil = end.toNanoOfDay() - toNanoOfDay();  // no overflow
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case NANOS: return nanosUntil;
                 case MICROS: return nanosUntil / 1000;
                 case MILLIS: return nanosUntil / 1000_000;
@@ -1583,12 +1583,11 @@ public final class LocalTime
         if (this == obj) {
             return true;
         }
-        if (obj instanceof LocalTime) {
+        return (obj instanceof LocalTime other)
-            LocalTime other = (LocalTime) obj;
+                && hour == other.hour
-            return hour == other.hour && minute == other.minute &&
+                && minute == other.minute
-                    second == other.second && nano == other.nano;
+                && second == other.second
-        }
+                && nano == other.nano;
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/MonthDay.java

@@ -444,8 +444,8 @@ public final class MonthDay
      */
     @Override
     public long getLong(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 // alignedDOW and alignedWOM not supported because they cannot be set in with()
                 case DAY_OF_MONTH: return day;
                 case MONTH_OF_YEAR: return month;
@@ -720,11 +720,9 @@ public final class MonthDay
         if (this == obj) {
             return true;
         }
-        if (obj instanceof MonthDay) {
+        return (obj instanceof MonthDay other)
-            MonthDay other = (MonthDay) obj;
+                && month == other.month
-            return month == other.month && day == other.day;
+                && day == other.day;
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/OffsetDateTime.java

@@ -596,8 +596,8 @@ public final class OffsetDateTime
      */
     @Override
     public int get(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case INSTANT_SECONDS:
                     throw new UnsupportedTemporalTypeException("Invalid field 'InstantSeconds' for get() method, use getLong() instead");
                 case OFFSET_SECONDS:
@@ -633,8 +633,8 @@ public final class OffsetDateTime
      */
     @Override
     public long getLong(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case INSTANT_SECONDS: return toEpochSecond();
                 case OFFSET_SECONDS: return getOffset().getTotalSeconds();
             }
@@ -1881,11 +1881,9 @@ public final class OffsetDateTime
         if (this == obj) {
             return true;
         }
-        if (obj instanceof OffsetDateTime) {
+        return (obj instanceof OffsetDateTime other)
-            OffsetDateTime other = (OffsetDateTime) obj;
+                && dateTime.equals(other.dateTime)
-            return dateTime.equals(other.dateTime) && offset.equals(other.offset);
+                && offset.equals(other.offset);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/OffsetTime.java

@@ -1178,9 +1178,9 @@ public final class OffsetTime
     @Override
     public long until(Temporal endExclusive, TemporalUnit unit) {
         OffsetTime end = OffsetTime.from(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
             long nanosUntil = end.toEpochNano() - toEpochNano();  // no overflow
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case NANOS: return nanosUntil;
                 case MICROS: return nanosUntil / 1000;
                 case MILLIS: return nanosUntil / 1000_000;
@@ -1360,11 +1360,9 @@ public final class OffsetTime
         if (this == obj) {
             return true;
         }
-        if (obj instanceof OffsetTime) {
+        return (obj instanceof OffsetTime other)
-            OffsetTime other = (OffsetTime) obj;
+                && time.equals(other.time)
-            return time.equals(other.time) && offset.equals(other.offset);
+                && offset.equals(other.offset);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/Period.java

@@ -992,13 +992,10 @@ public final class Period
         if (this == obj) {
             return true;
         }
-        if (obj instanceof Period) {
+        return (obj instanceof Period other)
-            Period other = (Period) obj;
+                && years == other.years
-            return years == other.years &&
+                && months == other.months
-                    months == other.months &&
+                && days == other.days;
-                    days == other.days;
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/Year.java

@@ -496,8 +496,8 @@ public final class Year
      */
     @Override
     public long getLong(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case YEAR_OF_ERA: return (year < 1 ? 1 - year : year);
                 case YEAR: return year;
                 case ERA: return (year < 1 ? 0 : 1);
@@ -708,8 +708,8 @@ public final class Year
      */
     @Override
     public Year plus(long amountToAdd, TemporalUnit unit) {
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case YEARS: return plusYears(amountToAdd);
                 case DECADES: return plusYears(Math.multiplyExact(amountToAdd, 10));
                 case CENTURIES: return plusYears(Math.multiplyExact(amountToAdd, 100));
@@ -914,9 +914,9 @@ public final class Year
     @Override
     public long until(Temporal endExclusive, TemporalUnit unit) {
         Year end = Year.from(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
             long yearsUntil = ((long) end.year) - year;  // no overflow
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case YEARS: return yearsUntil;
                 case DECADES: return yearsUntil / 10;
                 case CENTURIES: return yearsUntil / 100;

src/java.base/share/classes/java/time/YearMonth.java

@@ -485,8 +485,8 @@ public final class YearMonth
      */
     @Override
     public long getLong(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case MONTH_OF_YEAR: return month;
                 case PROLEPTIC_MONTH: return getProlepticMonth();
                 case YEAR_OF_ERA: return (year < 1 ? 1 - year : year);
@@ -805,8 +805,8 @@ public final class YearMonth
      */
     @Override
     public YearMonth plus(long amountToAdd, TemporalUnit unit) {
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case MONTHS: return plusMonths(amountToAdd);
                 case YEARS: return plusYears(amountToAdd);
                 case DECADES: return plusYears(Math.multiplyExact(amountToAdd, 10));
@@ -1046,9 +1046,9 @@ public final class YearMonth
     @Override
     public long until(Temporal endExclusive, TemporalUnit unit) {
         YearMonth end = YearMonth.from(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
             long monthsUntil = end.getProlepticMonth() - getProlepticMonth();  // no overflow
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case MONTHS: return monthsUntil;
                 case YEARS: return monthsUntil / 12;
                 case DECADES: return monthsUntil / 120;
@@ -1168,11 +1168,9 @@ public final class YearMonth
         if (this == obj) {
             return true;
         }
-        if (obj instanceof YearMonth) {
+        return (obj instanceof YearMonth other)
-            YearMonth other = (YearMonth) obj;
+                && year == other.year
-            return year == other.year && month == other.month;
+                && month == other.month;
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/ZoneId.java

@@ -602,11 +602,8 @@ public abstract class ZoneId implements Serializable {
         if (this == obj) {
            return true;
         }
-        if (obj instanceof ZoneId) {
+        return (obj instanceof ZoneId other)
-            ZoneId other = (ZoneId) obj;
+                && getId().equals(other.getId());
-            return getId().equals(other.getId());
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/ZonedDateTime.java

@@ -813,8 +813,8 @@ public final class ZonedDateTime
      */
     @Override  // override for Javadoc and performance
     public int get(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case INSTANT_SECONDS:
                     throw new UnsupportedTemporalTypeException("Invalid field 'InstantSeconds' for get() method, use getLong() instead");
                 case OFFSET_SECONDS:
@@ -850,8 +850,8 @@ public final class ZonedDateTime
      */
     @Override
     public long getLong(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case INSTANT_SECONDS: return toEpochSecond();
                 case OFFSET_SECONDS: return getOffset().getTotalSeconds();
             }

src/java.base/share/classes/java/time/chrono/ChronoLocalDateImpl.java

@@ -377,8 +377,8 @@ abstract class ChronoLocalDateImpl<D extends ChronoLocalDate>
     public long until(Temporal endExclusive, TemporalUnit unit) {
         Objects.requireNonNull(endExclusive, "endExclusive");
         ChronoLocalDate end = getChronology().date(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
-            switch ((ChronoUnit) unit) {
+            switch (chronoUnit) {
                 case DAYS: return daysUntil(end);
                 case WEEKS: return daysUntil(end) / 7;
                 case MONTHS: return monthsUntil(end);

src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java

@@ -373,10 +373,10 @@ final class ChronoLocalDateTimeImpl<D extends ChronoLocalDate>
         Objects.requireNonNull(endExclusive, "endExclusive");
         @SuppressWarnings("unchecked")
         ChronoLocalDateTime<D> end = (ChronoLocalDateTime<D>) getChronology().localDateTime(endExclusive);
-        if (unit instanceof ChronoUnit) {
+        if (unit instanceof ChronoUnit chronoUnit) {
             if (unit.isTimeBased()) {
                 long amount = end.getLong(EPOCH_DAY) - date.getLong(EPOCH_DAY);
-                switch ((ChronoUnit) unit) {
+                switch (chronoUnit) {
                     case NANOS: amount = Math.multiplyExact(amount, NANOS_PER_DAY); break;
                     case MICROS: amount = Math.multiplyExact(amount, MICROS_PER_DAY); break;
                     case MILLIS: amount = Math.multiplyExact(amount, MILLIS_PER_DAY); break;

src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java

@@ -199,11 +199,11 @@ final class ChronoPeriodImpl
      */
     private ChronoPeriodImpl validateAmount(TemporalAmount amount) {
         Objects.requireNonNull(amount, "amount");
-        if (amount instanceof ChronoPeriodImpl == false) {
+        if (!(amount instanceof ChronoPeriodImpl)) {
             throw new DateTimeException("Unable to obtain ChronoPeriod from TemporalAmount: " + amount.getClass());
         }
         ChronoPeriodImpl period = (ChronoPeriodImpl) amount;
-        if (chrono.equals(period.getChronology()) == false) {
+        if (!(chrono.equals(period.getChronology()))) {
             throw new ClassCastException("Chronology mismatch, expected: " + chrono.getId() + ", actual: " + period.getChronology().getId());
         }
         return period;
@@ -320,12 +320,9 @@ final class ChronoPeriodImpl
         if (this == obj) {
             return true;
         }
-        if (obj instanceof ChronoPeriodImpl) {
+        return (obj instanceof ChronoPeriodImpl other)
-            ChronoPeriodImpl other = (ChronoPeriodImpl) obj;
+                && years == other.years && months == other.months
-            return years == other.years && months == other.months &&
+                && days == other.days && chrono.equals(other.chrono);
-                    days == other.days && chrono.equals(other.chrono);
-        }
-        return false;
     }
 
     @Override

src/java.base/share/classes/java/time/chrono/ChronoZonedDateTime.java

@@ -195,8 +195,8 @@ public interface ChronoZonedDateTime<D extends ChronoLocalDate>
 
     @Override
     default int get(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case INSTANT_SECONDS:
                     throw new UnsupportedTemporalTypeException("Invalid field 'InstantSeconds' for get() method, use getLong() instead");
                 case OFFSET_SECONDS:
@@ -209,8 +209,8 @@ public interface ChronoZonedDateTime<D extends ChronoLocalDate>
 
     @Override
     default long getLong(TemporalField field) {
-        if (field instanceof ChronoField) {
+        if (field instanceof ChronoField chronoField) {
-            switch ((ChronoField) field) {
+            switch (chronoField) {
                 case INSTANT_SECONDS: return toEpochSecond();
                 case OFFSET_SECONDS: return getOffset().getTotalSeconds();
             }

src/java.base/share/classes/java/time/chrono/HijrahChronology.java

@@ -498,7 +498,7 @@ public final class HijrahChronology extends AbstractChronology implements Serial
 
     @Override
     public int prolepticYear(Era era, int yearOfEra) {
-        if (era instanceof HijrahEra == false) {
+        if (!(era instanceof HijrahEra)) {
             throw new ClassCastException("Era must be HijrahEra");
         }
         return yearOfEra;

src/java.base/share/classes/java/time/chrono/HijrahDate.java

@@ -628,14 +628,11 @@ public final class HijrahDate
         if (this == obj) {
             return true;
         }
-        if (obj instanceof HijrahDate) {
+        return (obj instanceof HijrahDate otherDate)
-            HijrahDate otherDate = (HijrahDate) obj;
+                && prolepticYear == otherDate.prolepticYear
-            return prolepticYear == otherDate.prolepticYear
                 && this.monthOfYear == otherDate.monthOfYear
                 && this.dayOfMonth == otherDate.dayOfMonth
                 && getChronology().equals(otherDate.getChronology());
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/chrono/IsoChronology.java

@@ -479,7 +479,7 @@ public final class IsoChronology extends AbstractChronology implements Serializa
 
     @Override
     public int prolepticYear(Era era, int yearOfEra) {
-        if (era instanceof IsoEra == false) {
+        if (!(era instanceof IsoEra)) {
             throw new ClassCastException("Era must be IsoEra");
         }
         return (era == IsoEra.CE ? yearOfEra : 1 - yearOfEra);

src/java.base/share/classes/java/time/chrono/JapaneseChronology.java

@@ -202,10 +202,10 @@ public final class JapaneseChronology extends AbstractChronology implements Seri
      */
     @Override
     public JapaneseDate date(Era era, int yearOfEra, int month, int dayOfMonth) {
-        if (era instanceof JapaneseEra == false) {
+        if (!(era instanceof JapaneseEra jera)) {
             throw new ClassCastException("Era must be JapaneseEra");
         }
-        return JapaneseDate.of((JapaneseEra) era, yearOfEra, month, dayOfMonth);
+        return JapaneseDate.of(jera, yearOfEra, month, dayOfMonth);
     }
 
     /**

src/java.base/share/classes/java/time/chrono/JapaneseDate.java

@@ -697,11 +697,8 @@ public final class JapaneseDate
         if (this == obj) {
             return true;
         }
-        if (obj instanceof JapaneseDate) {
+        return (obj instanceof JapaneseDate otherDate)
-            JapaneseDate otherDate = (JapaneseDate) obj;
+            && this.isoDate.equals(otherDate.isoDate);
-            return this.isoDate.equals(otherDate.isoDate);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/chrono/MinguoChronology.java

@@ -293,7 +293,7 @@ public final class MinguoChronology extends AbstractChronology implements Serial
 
     @Override
     public int prolepticYear(Era era, int yearOfEra) {
-        if (era instanceof MinguoEra == false) {
+        if (!(era instanceof MinguoEra)) {
             throw new ClassCastException("Era must be MinguoEra");
         }
         return (era == MinguoEra.ROC ? yearOfEra : 1 - yearOfEra);

src/java.base/share/classes/java/time/chrono/MinguoDate.java

@@ -459,11 +459,8 @@ public final class MinguoDate
         if (this == obj) {
             return true;
         }
-        if (obj instanceof MinguoDate) {
+        return (obj instanceof MinguoDate otherDate)
-            MinguoDate otherDate = (MinguoDate) obj;
+                && this.isoDate.equals(otherDate.isoDate);
-            return this.isoDate.equals(otherDate.isoDate);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/chrono/ThaiBuddhistChronology.java

@@ -329,7 +329,7 @@ public final class ThaiBuddhistChronology extends AbstractChronology implements
 
     @Override
     public int prolepticYear(Era era, int yearOfEra) {
-        if (era instanceof ThaiBuddhistEra == false) {
+        if (!(era instanceof ThaiBuddhistEra)) {
             throw new ClassCastException("Era must be BuddhistEra");
         }
         return (era == ThaiBuddhistEra.BE ? yearOfEra : 1 - yearOfEra);

src/java.base/share/classes/java/time/chrono/ThaiBuddhistDate.java

@@ -459,11 +459,8 @@ public final class ThaiBuddhistDate
         if (this == obj) {
             return true;
         }
-        if (obj instanceof ThaiBuddhistDate) {
+        return (obj instanceof ThaiBuddhistDate otherDate)
-            ThaiBuddhistDate otherDate = (ThaiBuddhistDate) obj;
+                && this.isoDate.equals(otherDate.isoDate);
-            return this.isoDate.equals(otherDate.isoDate);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/format/DateTimeFormatter.java

@@ -2208,7 +2208,7 @@ public final class DateTimeFormatter {
             Objects.requireNonNull(obj, "obj");
             Objects.requireNonNull(toAppendTo, "toAppendTo");
             Objects.requireNonNull(pos, "pos");
-            if (obj instanceof TemporalAccessor == false) {
+            if (!(obj instanceof TemporalAccessor)) {
                 throw new IllegalArgumentException("Format target must implement TemporalAccessor");
             }
             pos.setBeginIndex(0);

src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java

@@ -165,7 +165,7 @@ public final class DateTimeFormatterBuilder {
      */
     private static final TemporalQuery<ZoneId> QUERY_REGION_ONLY = (temporal) -> {
         ZoneId zone = temporal.query(TemporalQueries.zoneId());
-        return (zone != null && zone instanceof ZoneOffset == false ? zone : null);
+        return zone instanceof ZoneOffset ? null : zone;
     };
 
     /**

src/java.base/share/classes/java/time/format/Parsed.java

@@ -189,7 +189,7 @@ final class Parsed implements TemporalAccessor {
                 (time != null && time.isSupported(field))) {
             return true;
         }
-        return field != null && (field instanceof ChronoField == false) && field.isSupportedBy(this);
+        return field != null && (!(field instanceof ChronoField)) && field.isSupportedBy(this);
     }
 
     @Override

src/java.base/share/classes/java/time/temporal/ValueRange.java

@@ -393,12 +393,11 @@ public final class ValueRange implements Serializable {
         if (obj == this) {
             return true;
         }
-        if (obj instanceof ValueRange) {
+        return (obj instanceof ValueRange other)
-            ValueRange other = (ValueRange) obj;
+                && minSmallest == other.minSmallest
-            return minSmallest == other.minSmallest && minLargest == other.minLargest &&
+                && minLargest == other.minLargest
-                   maxSmallest == other.maxSmallest && maxLargest == other.maxLargest;
+                && maxSmallest == other.maxSmallest
-        }
+                && maxLargest == other.maxLargest;
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java

@@ -421,12 +421,10 @@ public final class ZoneOffsetTransition
         if (other == this) {
             return true;
         }
-        if (other instanceof ZoneOffsetTransition) {
+        return (other instanceof ZoneOffsetTransition d)
-            ZoneOffsetTransition d = (ZoneOffsetTransition) other;
+                && epochSecond == d.epochSecond
-            return epochSecond == d.epochSecond &&
+                && offsetBefore.equals(d.offsetBefore)
-                offsetBefore.equals(d.offsetBefore) && offsetAfter.equals(d.offsetAfter);
+                && offsetAfter.equals(d.offsetAfter);
-        }
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/zone/ZoneOffsetTransitionRule.java

@@ -519,17 +519,16 @@ public final class ZoneOffsetTransitionRule implements Serializable {
         if (otherRule == this) {
             return true;
         }
-        if (otherRule instanceof ZoneOffsetTransitionRule) {
+        return (otherRule instanceof ZoneOffsetTransitionRule other)
-            ZoneOffsetTransitionRule other = (ZoneOffsetTransitionRule) otherRule;
+                && month == other.month
-            return month == other.month && dom == other.dom && dow == other.dow &&
+                && dom == other.dom
-                timeDefinition == other.timeDefinition &&
+                && dow == other.dow
-                time.equals(other.time) &&
+                && timeDefinition == other.timeDefinition
-                timeEndOfDay == other.timeEndOfDay &&
+                && timeEndOfDay == other.timeEndOfDay
-                standardOffset.equals(other.standardOffset) &&
+                && time.equals(other.time)
-                offsetBefore.equals(other.offsetBefore) &&
+                && standardOffset.equals(other.standardOffset)
-                offsetAfter.equals(other.offsetAfter);
+                && offsetBefore.equals(other.offsetBefore)
-        }
+                && offsetAfter.equals(other.offsetAfter);
-        return false;
     }
 
     /**

src/java.base/share/classes/java/time/zone/ZoneRules.java

@@ -1027,15 +1027,12 @@ public final class ZoneRules implements Serializable {
         if (this == otherRules) {
            return true;
         }
-        if (otherRules instanceof ZoneRules) {
+        return (otherRules instanceof ZoneRules other)
-            ZoneRules other = (ZoneRules) otherRules;
+                && Arrays.equals(standardTransitions, other.standardTransitions)
-            return Arrays.equals(standardTransitions, other.standardTransitions) &&
+                && Arrays.equals(standardOffsets, other.standardOffsets)
-                    Arrays.equals(standardOffsets, other.standardOffsets) &&
+                && Arrays.equals(savingsInstantTransitions, other.savingsInstantTransitions)
-                    Arrays.equals(savingsInstantTransitions, other.savingsInstantTransitions) &&
+                && Arrays.equals(wallOffsets, other.wallOffsets)
-                    Arrays.equals(wallOffsets, other.wallOffsets) &&
+                && Arrays.equals(lastRules, other.lastRules);
-                    Arrays.equals(lastRules, other.lastRules);
-        }
-        return false;
     }
 
     /**