archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8268469: Update java.time to use switch expressions

Browse source 
Reviewed-by: lancea, naoto, dfuchs, iris, chegar
This commit is contained in:
Patrick Concannon 2021-06-25 15:42:38 +00:00
parent ffa34ed429
commit 1d167978e5
22 changed files with 256 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/java.base/share/classes/java/time/Ser.java
View file

@ -270,24 +270,23 @@ final class Ser implements Externalizable {
private static Serializable readInternal(byte type, ObjectInput in)
throws IOException, ClassNotFoundException {
switch (type) {
case DURATION_TYPE: return Duration.readExternal(in);
case INSTANT_TYPE: return Instant.readExternal(in);
case LOCAL_DATE_TYPE: return LocalDate.readExternal(in);
case LOCAL_DATE_TIME_TYPE: return LocalDateTime.readExternal(in);
case LOCAL_TIME_TYPE: return LocalTime.readExternal(in);
case ZONE_DATE_TIME_TYPE: return ZonedDateTime.readExternal(in);
case ZONE_OFFSET_TYPE: return ZoneOffset.readExternal(in);
case ZONE_REGION_TYPE: return ZoneRegion.readExternal(in);
case OFFSET_TIME_TYPE: return OffsetTime.readExternal(in);
case OFFSET_DATE_TIME_TYPE: return OffsetDateTime.readExternal(in);
case YEAR_TYPE: return Year.readExternal(in);
case YEAR_MONTH_TYPE: return YearMonth.readExternal(in);
case MONTH_DAY_TYPE: return MonthDay.readExternal(in);
case PERIOD_TYPE: return Period.readExternal(in);
default:
throw new StreamCorruptedException("Unknown serialized type");
}
return switch (type) {
case DURATION_TYPE -> Duration.readExternal(in);
case INSTANT_TYPE -> Instant.readExternal(in);
case LOCAL_DATE_TYPE -> LocalDate.readExternal(in);
case LOCAL_DATE_TIME_TYPE -> LocalDateTime.readExternal(in);
case LOCAL_TIME_TYPE -> LocalTime.readExternal(in);
case ZONE_DATE_TIME_TYPE -> ZonedDateTime.readExternal(in);
case ZONE_OFFSET_TYPE -> ZoneOffset.readExternal(in);
case ZONE_REGION_TYPE -> ZoneRegion.readExternal(in);
case OFFSET_TIME_TYPE -> OffsetTime.readExternal(in);
case OFFSET_DATE_TIME_TYPE -> OffsetDateTime.readExternal(in);
case YEAR_TYPE -> Year.readExternal(in);
case YEAR_MONTH_TYPE -> YearMonth.readExternal(in);
case MONTH_DAY_TYPE -> MonthDay.readExternal(in);
case PERIOD_TYPE -> Period.readExternal(in);
default -> throw new StreamCorruptedException("Unknown serialized type");
};
}
/**