Skip to content

Commit c0037b8

Browse files
dpursehousedpursehouse
committed
Replace joda-time with Java 8 time API
In the Gerrit project we have replaced joda-time with the Java 8 time API. Do the same in Gitiles. Change-Id: If4cd80167526cbb412f97ef1fce34809941e1d6b
1 parent ac660e9 commit c0037b8

7 files changed

Lines changed: 14 additions & 23 deletions

File tree

‎WORKSPACE‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ maven_jar(
3838
sha1 = "96c528475465aeb22cce60605d230a7e67cebd7b",
3939
)
4040

41-
maven_jar(
42-
name = "joda_time",
43-
artifact = "joda-time:joda-time:2.9.9",
44-
sha1 = "f7b520c458572890807d143670c9b24f4de90897",
45-
)
46-
4741
maven_jar(
4842
name = "jsr305",
4943
artifact = "com.google.code.findbugs:jsr305:3.0.0",

‎java/com/google/gitiles/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ DEPS = [
55
"//lib:gson",
66
"//lib:guava",
77
"//lib:html-types",
8-
"//lib:joda-time",
98
"//lib:jsr305",
109
"//lib:commonmark",
1110
"//lib:cm-autolink",

‎java/com/google/gitiles/BaseServlet.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.io.OutputStreamWriter;
4040
import java.io.Writer;
4141
import java.lang.reflect.Type;
42+
import java.time.Instant;
4243
import java.util.Map;
4344
import java.util.Optional;
4445
import java.util.regex.Pattern;
@@ -47,7 +48,6 @@
4748
import javax.servlet.http.HttpServlet;
4849
import javax.servlet.http.HttpServletRequest;
4950
import javax.servlet.http.HttpServletResponse;
50-
import org.joda.time.Instant;
5151

5252
/** Base servlet class for Gitiles servlets that serve Soy templates. */
5353
public abstract class BaseServlet extends HttpServlet {
@@ -59,7 +59,7 @@ static void setNotCacheable(HttpServletResponse res) {
5959
res.setHeader(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, max-age=0, must-revalidate");
6060
res.setHeader(HttpHeaders.PRAGMA, "no-cache");
6161
res.setHeader(HttpHeaders.EXPIRES, "Mon, 01 Jan 1990 00:00:00 GMT");
62-
res.setDateHeader(HttpHeaders.DATE, new Instant().getMillis());
62+
res.setDateHeader(HttpHeaders.DATE, Instant.now().toEpochMilli());
6363
}
6464

6565
public static BaseServlet notFoundServlet() {

‎java/com/google/gitiles/ConfigUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import static java.util.concurrent.TimeUnit.MILLISECONDS;
1818

1919
import com.google.common.cache.CacheBuilder;
20+
import java.time.Duration;
2021
import java.util.Optional;
2122
import java.util.TimeZone;
2223
import java.util.concurrent.TimeUnit;
2324
import javax.annotation.Nullable;
2425
import org.eclipse.jgit.lib.Config;
25-
import org.joda.time.Duration;
2626

2727
/** Utilities for working with {@link Config} objects. */
2828
public class ConfigUtil {
@@ -47,7 +47,7 @@ public static Duration getDuration(
4747
String name,
4848
@Nullable Duration defaultValue) {
4949
long m = config.getTimeUnit(section, subsection, name, -1, MILLISECONDS);
50-
return m == -1 ? defaultValue : Duration.millis(m);
50+
return m == -1 ? defaultValue : Duration.ofMillis(m);
5151
}
5252

5353
/**
@@ -68,11 +68,11 @@ public static CacheBuilder<Object, Object> getCacheBuilder(Config config, String
6868
}
6969
Duration expireAfterWrite = getDuration(config, "cache", name, "expireAfterWrite", null);
7070
if (expireAfterWrite != null) {
71-
b.expireAfterWrite(expireAfterWrite.getMillis(), TimeUnit.MILLISECONDS);
71+
b.expireAfterWrite(expireAfterWrite.toMillis(), TimeUnit.MILLISECONDS);
7272
}
7373
Duration expireAfterAccess = getDuration(config, "cache", name, "expireAfterAccess", null);
7474
if (expireAfterAccess != null) {
75-
b.expireAfterAccess(expireAfterAccess.getMillis(), TimeUnit.MILLISECONDS);
75+
b.expireAfterAccess(expireAfterAccess.toMillis(), TimeUnit.MILLISECONDS);
7676
}
7777
// Add other methods as needed.
7878
} catch (IllegalArgumentException e) {

‎javatests/com/google/gitiles/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ DEPS = [
33
"//lib:guava",
44
"//lib/jgit:jgit",
55
"//lib/jgit:jgit-servlet",
6-
"//lib:joda-time",
76
"//lib/soy:soy",
87
]
98

‎javatests/com/google/gitiles/ConfigUtilTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import static com.google.gitiles.ConfigUtil.getDuration;
1919
import static org.junit.Assert.fail;
2020

21+
import java.time.Duration;
2122
import org.eclipse.jgit.lib.Config;
22-
import org.joda.time.Duration;
2323
import org.junit.Test;
2424
import org.junit.runner.RunWith;
2525
import org.junit.runners.JUnit4;
@@ -29,13 +29,13 @@
2929
public class ConfigUtilTest {
3030
@Test
3131
public void getDurationReturnsDuration() throws Exception {
32-
Duration def = Duration.standardSeconds(2);
32+
Duration def = Duration.ofSeconds(2);
3333
Config config = new Config();
3434
Duration t;
3535

3636
config.setString("core", "dht", "timeout", "500 ms");
3737
t = getDuration(config, "core", "dht", "timeout", def);
38-
assertThat(t.getMillis()).isEqualTo(500);
38+
assertThat(t.toMillis()).isEqualTo(500);
3939

4040
config.setString("core", "dht", "timeout", "5.2 sec");
4141
try {
@@ -47,25 +47,25 @@ public void getDurationReturnsDuration() throws Exception {
4747

4848
config.setString("core", "dht", "timeout", "1 min");
4949
t = getDuration(config, "core", "dht", "timeout", def);
50-
assertThat(t.getMillis()).isEqualTo(60000);
50+
assertThat(t.toMillis()).isEqualTo(60000);
5151
}
5252

5353
@Test
5454
public void getDurationCanReturnDefault() throws Exception {
55-
Duration def = Duration.standardSeconds(1);
55+
Duration def = Duration.ofSeconds(1);
5656
Config config = new Config();
5757
Duration t;
5858

5959
t = getDuration(config, "core", null, "blank", def);
60-
assertThat(t.getMillis()).isEqualTo(1000);
60+
assertThat(t.toMillis()).isEqualTo(1000);
6161

6262
config.setString("core", null, "blank", "");
6363
t = getDuration(config, "core", null, "blank", def);
64-
assertThat(t.getMillis()).isEqualTo(1000);
64+
assertThat(t.toMillis()).isEqualTo(1000);
6565

6666
config.setString("core", null, "blank", " ");
6767
t = getDuration(config, "core", null, "blank", def);
68-
assertThat(t.getMillis()).isEqualTo(1000);
68+
assertThat(t.toMillis()).isEqualTo(1000);
6969
}
7070

7171
@Test

‎lib/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package(
1515
"gfm-tables",
1616
"html-types",
1717
"jsr305",
18-
"joda-time",
1918
"servlet-api_2_5",
2019
"servlet-api_3_0",
2120
"truth",

0 commit comments

Comments
 (0)