archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +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

23
src/java.base/share/classes/java/time/OffsetDateTime.java
View file

@ -597,13 +597,12 @@ public final class OffsetDateTime
@Override
public int get(TemporalField field) {
if (field instanceof ChronoField chronoField) {
switch (chronoField) {
case INSTANT_SECONDS:
throw new UnsupportedTemporalTypeException("Invalid field 'InstantSeconds' for get() method, use getLong() instead");
case OFFSET_SECONDS:
return getOffset().getTotalSeconds();
}
return dateTime.get(field);
return switch (chronoField) {
case INSTANT_SECONDS -> throw new UnsupportedTemporalTypeException("Invalid field " +
"'InstantSeconds' for get() method, use getLong() instead");
case OFFSET_SECONDS -> getOffset().getTotalSeconds();
default -> dateTime.get(field);
};
}
return Temporal.super.get(field);
}
@ -634,11 +633,11 @@ public final class OffsetDateTime
@Override
public long getLong(TemporalField field) {
if (field instanceof ChronoField chronoField) {
switch (chronoField) {
case INSTANT_SECONDS: return toEpochSecond();
case OFFSET_SECONDS: return getOffset().getTotalSeconds();
}
return dateTime.getLong(field);
return switch (chronoField) {
case INSTANT_SECONDS -> toEpochSecond();
case OFFSET_SECONDS -> getOffset().getTotalSeconds();
default -> dateTime.getLong(field);
};
}
return field.getFrom(this);
}