/*
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.trellisldp.http;

import static java.time.ZonedDateTime.parse;
import static java.time.format.DateTimeFormatter.RFC_1123_DATE_TIME;
import static java.util.Objects.nonNull;
import static java.util.Optional.empty;
import static java.util.Optional.of;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
import static org.slf4j.LoggerFactory.getLogger;

import java.time.Instant;
import java.time.DateTimeException;
import java.util.Optional;

import javax.ws.rs.WebApplicationException;

import org.slf4j.Logger;

/**
 * @author acoburn
 */
public class AcceptDatetime {

    private static final Logger LOGGER = getLogger(AcceptDatetime.class);

    private final Instant datetime;

    /**
     * Create an Accept-Datetime header object
     * @param datetime the date time in RFC 1123 format
     */
    public AcceptDatetime(final String datetime) {
        this.datetime = parseDatetime(datetime).orElseThrow(() ->
                new WebApplicationException("Invalid Accept-Datetime request", BAD_REQUEST));
    }

    /**
     * Retrieve the corresponding instant
     * @return the instant
     */
    public Instant getInstant() {
        return datetime;
    }

    @Override
    public String toString() {
        return datetime.toString();
    }

    private static Optional<Instant> parseDatetime(final String datetime) {
        if (nonNull(datetime)) {
            try {
                return of(parse(datetime.trim(), RFC_1123_DATE_TIME).toInstant());
            } catch (final DateTimeException ex) {
                LOGGER.warn("Invalid date supplied ({}): {}", datetime, ex.getMessage());
            }
        }
        return empty();
    }
}

@@ -944,23 +944,33 @@
 va.time.
-Instant
+DateTimeException
 ;%0Aimport
@@ -980,33 +980,23 @@
 va.time.
-DateTimeException
+Instant
 ;%0Aimport

Fix import order