jdk-sandbox: comparison jdk/src/share/classes/java/time/ZoneOffset.java

equal deleted inserted replaced

-:3bbdae468b05
+:60207b2b4b42
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 package java.time;
+import java.time.temporal.UnsupportedTemporalTypeException;
 import static java.time.LocalTime.MINUTES_PER_HOUR;
 import static java.time.LocalTime.SECONDS_PER_HOUR;
 import static java.time.LocalTime.SECONDS_PER_MINUTE;
 import static java.time.temporal.ChronoField.OFFSET_SECONDS;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.time.temporal.ChronoField;
-import java.time.temporal.Queries;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAdjuster;
 import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalQuery;
 * which this factory converts to an instance of {@code ZoneOffset}.
 * <p>
 * A {@code TemporalAccessor} represents some form of date and time information.
 * This factory converts the arbitrary temporal object to an instance of {@code ZoneOffset}.
 * <p>
-* The conversion uses the {@link Queries#offset()} query, which relies
+* The conversion uses the {@link TemporalQuery#offset()} query, which relies
 * on extracting the {@link ChronoField#OFFSET_SECONDS OFFSET_SECONDS} field.
 * <p>
 * This method matches the signature of the functional interface {@link TemporalQuery}
 * allowing it to be used in queries via method reference, {@code ZoneOffset::from}.
 *
 * @param temporal  the temporal object to convert, not null
 * @return the zone-offset, not null
 * @throws DateTimeException if unable to convert to an {@code ZoneOffset}
 */
 public static ZoneOffset from(TemporalAccessor temporal) {
-ZoneOffset offset = temporal.query(Queries.offset());
+ZoneOffset offset = temporal.query(TemporalQuery.offset());
 if (offset == null) {
 throw new DateTimeException("Unable to obtain ZoneOffset from TemporalAccessor: " + temporal.getClass());
 }
 return offset;
 }
 * or for some other reason, an exception is thrown.
 * <p>
 * If the field is a {@link ChronoField} then the query is implemented here.
 * The {@link #isSupported(TemporalField) supported fields} will return
 * appropriate range instances.
-* All other {@code ChronoField} instances will throw a {@code DateTimeException}.
+* All other {@code ChronoField} instances will throw an {@code UnsupportedTemporalTypeException}.
 * <p>
 * If the field is not a {@code ChronoField}, then the result of this method
 * is obtained by invoking {@code TemporalField.rangeRefinedBy(TemporalAccessor)}
 * passing {@code this} as the argument.
 * Whether the range can be obtained is determined by the field.
 *
 * @param field  the field to query the range for, not null
 * @return the range of valid values for the field, not null
 * @throws DateTimeException if the range for the field cannot be obtained
+* @throws UnsupportedTemporalTypeException if the field is not supported
 */
 @Override  // override for Javadoc
 public ValueRange range(TemporalField field) {
 return TemporalAccessor.super.range(field);
 }
 * If it is not possible to return the value, because the field is not supported
 * or for some other reason, an exception is thrown.
 * <p>
 * If the field is a {@link ChronoField} then the query is implemented here.
 * The {@code OFFSET_SECONDS} field returns the value of the offset.
-* All other {@code ChronoField} instances will throw a {@code DateTimeException}.
+* All other {@code ChronoField} instances will throw an {@code UnsupportedTemporalTypeException}.
 * <p>
 * If the field is not a {@code ChronoField}, then the result of this method
 * is obtained by invoking {@code TemporalField.getFrom(TemporalAccessor)}
 * passing {@code this} as the argument. Whether the value can be obtained,
 * and what the value represents, is determined by the field.
 *
 * @param field  the field to get, not null
 * @return the value for the field
-* @throws DateTimeException if a value for the field cannot be obtained
+* @throws DateTimeException if a value for the field cannot be obtained or
+*         the value is outside the range of valid values for the field
+* @throws UnsupportedTemporalTypeException if the field is not supported or
+*         the range of values exceeds an {@code int}
 * @throws ArithmeticException if numeric overflow occurs
 */
 @Override  // override for Javadoc and performance
 public int get(TemporalField field) {
 if (field == OFFSET_SECONDS) {
 return totalSeconds;
 } else if (field instanceof ChronoField) {
-throw new DateTimeException("Unsupported field: " + field.getName());
+throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
 }
 return range(field).checkValidIntValue(getLong(field), field);
 }
 /**
 * If it is not possible to return the value, because the field is not supported
 * or for some other reason, an exception is thrown.
 * <p>
 * If the field is a {@link ChronoField} then the query is implemented here.
 * The {@code OFFSET_SECONDS} field returns the value of the offset.
-* All other {@code ChronoField} instances will throw a {@code DateTimeException}.
+* All other {@code ChronoField} instances will throw an {@code UnsupportedTemporalTypeException}.
 * <p>
 * If the field is not a {@code ChronoField}, then the result of this method
 * is obtained by invoking {@code TemporalField.getFrom(TemporalAccessor)}
 * passing {@code this} as the argument. Whether the value can be obtained,
 * and what the value represents, is determined by the field.
 *
 * @param field  the field to get, not null
 * @return the value for the field
 * @throws DateTimeException if a value for the field cannot be obtained
+* @throws UnsupportedTemporalTypeException if the field is not supported
 * @throws ArithmeticException if numeric overflow occurs
 */
 @Override
 public long getLong(TemporalField field) {
 if (field == OFFSET_SECONDS) {
 return totalSeconds;
 } else if (field instanceof ChronoField) {
-throw new DateTimeException("Unsupported field: " + field.getName());
+throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
 }
 return field.getFrom(this);
 }
 //-----------------------------------------------------------------------
 * @throws ArithmeticException if numeric overflow occurs (defined by the query)
 */
 @SuppressWarnings("unchecked")
 @Override
 public <R> R query(TemporalQuery<R> query) {
-if (query == Queries.offset() || query == Queries.zone()) {
+if (query == TemporalQuery.offset() || query == TemporalQuery.zone()) {
 return (R) this;
 }
 return TemporalAccessor.super.query(query);
 }

changeset 16852	60207b2b4b42
parent 15658	55b829ca2334
child 17474	8c100beabcc0