opendev/gerrit
Code Issues Proposed changes

Remove Apache DateUtil Dependency

Browse Source 
This can be done with Java8 Date now and the dependency is no longer
needed.

Change-Id: Ia87e943c2321be09dad7347a3d582815b9ced53c
This commit is contained in:
Patrick Hiesel 2016-12-02 13:40:00 +01:00
parent 264f090785
commit 537ef0e8f4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-util-http/src/test/java/com/google/gerrit/util/http/testutil/FakeHttpServletRequest.java
View File

@ -25,12 +25,12 @@ import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.extensions.restapi.Url;
import org.apache.http.client.utils.DateUtils;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.security.Principal; import java.security.Principal;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
@ -55,6 +55,8 @@ import javax.servlet.http.Part;
/** Simple fake implementation of {@link HttpServletRequest}. */ /** Simple fake implementation of {@link HttpServletRequest}. */
public class FakeHttpServletRequest implements HttpServletRequest { public class FakeHttpServletRequest implements HttpServletRequest {
public static final String SERVLET_PATH = "/b"; public static final String SERVLET_PATH = "/b";
public static final DateTimeFormatter rfcDateformatter =
DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss ZZZ");
private final Map<String, Object> attributes; private final Map<String, Object> attributes;
private final ListMultimap<String, String> headers; private final ListMultimap<String, String> headers;
@ -263,7 +265,8 @@ public class FakeHttpServletRequest implements HttpServletRequest {
@Override @Override
public long getDateHeader(String name) { public long getDateHeader(String name) {
String v = getHeader(name); String v = getHeader(name);
return v != null ? DateUtils.parseDate(v).getTime() : 0; return v == null ? 0 :
rfcDateformatter.parse(v, Instant::from).getEpochSecond();
} }
@Override @Override