Skip to content

Commit 1c456ea

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
Migrating from Joda Duration/Instant to ThreeTenBP (#1985)
1 parent cda2832 commit 1c456ea

42 files changed

Lines changed: 325 additions & 329 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.UUID;
2828
import java.util.logging.Level;
2929
import java.util.logging.Logger;
30-
import org.joda.time.Duration;
30+
import org.threeten.bp.Duration;
3131

3232
/**
3333
* Utility to create a remote BigQuery configuration for testing. BigQuery options can be obtained
@@ -125,13 +125,13 @@ public static RemoteBigQueryHelper create() {
125125

126126
private static RetrySettings retrySettings() {
127127
return RetrySettings.newBuilder().setMaxAttempts(10)
128-
.setMaxRetryDelay(Duration.millis(30000L))
129-
.setTotalTimeout(Duration.millis(120000L))
130-
.setInitialRetryDelay(Duration.millis(250L))
128+
.setMaxRetryDelay(Duration.ofMillis(30000L))
129+
.setTotalTimeout(Duration.ofMillis(120000L))
130+
.setInitialRetryDelay(Duration.ofMillis(250L))
131131
.setRetryDelayMultiplier(1.0)
132-
.setInitialRpcTimeout(Duration.millis(120000L))
132+
.setInitialRpcTimeout(Duration.ofMillis(120000L))
133133
.setRpcTimeoutMultiplier(1.0)
134-
.setMaxRpcTimeout(Duration.millis(120000L))
134+
.setMaxRpcTimeout(Duration.ofMillis(120000L))
135135
.build();
136136
}
137137

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
import java.io.InputStream;
2828
import java.util.concurrent.ExecutionException;
2929
import org.easymock.EasyMock;
30-
import org.joda.time.Duration;
3130
import org.junit.Rule;
3231
import org.junit.Test;
3332
import org.junit.rules.ExpectedException;
33+
import org.threeten.bp.Duration;
3434

3535
public class RemoteBigQueryHelperTest {
3636

@@ -87,8 +87,8 @@ public void testCreateFromStream() {
8787
assertEquals(60000,
8888
((HttpTransportOptions) options.getTransportOptions()).getReadTimeout());
8989
assertEquals(10, options.getRetrySettings().getMaxAttempts());
90-
assertEquals(Duration.millis(30000), options.getRetrySettings().getMaxRetryDelay());
91-
assertEquals(Duration.millis(120000), options.getRetrySettings().getTotalTimeout());
92-
assertEquals(Duration.millis(250), options.getRetrySettings().getInitialRetryDelay());
90+
assertEquals(Duration.ofMillis(30000), options.getRetrySettings().getMaxRetryDelay());
91+
assertEquals(Duration.ofMillis(120000), options.getRetrySettings().getTotalTimeout());
92+
assertEquals(Duration.ofMillis(250), options.getRetrySettings().getInitialRetryDelay());
9393
}
9494
}

‎google-cloud-compute/src/main/java/com/google/cloud/compute/testing/RemoteComputeHelper.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.UUID;
2727
import java.util.logging.Level;
2828
import java.util.logging.Logger;
29-
import org.joda.time.Duration;
29+
import org.threeten.bp.Duration;
3030

3131
/**
3232
* Utility to create a remote Compute configuration for testing. Compute options can be obtained
@@ -112,13 +112,13 @@ public static RemoteComputeHelper create() {
112112

113113
private static RetrySettings retrySettings() {
114114
return RetrySettings.newBuilder().setMaxAttempts(10)
115-
.setMaxRetryDelay(Duration.millis(30000L))
116-
.setTotalTimeout(Duration.millis(120000L))
117-
.setInitialRetryDelay(Duration.millis(250L))
115+
.setMaxRetryDelay(Duration.ofMillis(30000L))
116+
.setTotalTimeout(Duration.ofMillis(120000L))
117+
.setInitialRetryDelay(Duration.ofMillis(250L))
118118
.setRetryDelayMultiplier(1.0)
119-
.setInitialRpcTimeout(Duration.millis(120000L))
119+
.setInitialRpcTimeout(Duration.ofMillis(120000L))
120120
.setRpcTimeoutMultiplier(1.0)
121-
.setMaxRpcTimeout(Duration.millis(120000L))
121+
.setMaxRpcTimeout(Duration.ofMillis(120000L))
122122
.build();
123123
}
124124

‎google-cloud-compute/src/test/java/com/google/cloud/compute/testing/RemoteComputeHelperTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.google.cloud.compute.ComputeOptions;
2626
import com.google.cloud.compute.testing.RemoteComputeHelper.ComputeHelperException;
2727

28-
import org.joda.time.Duration;
28+
import org.threeten.bp.Duration;
2929
import org.junit.Test;
3030

3131
import java.io.ByteArrayInputStream;
@@ -84,9 +84,9 @@ public void testCreateFromStream() {
8484
assertEquals(60000,
8585
((HttpTransportOptions) options.getTransportOptions()).getReadTimeout());
8686
assertEquals(10, options.getRetrySettings().getMaxAttempts());
87-
assertEquals(Duration.millis(30000), options.getRetrySettings().getMaxRetryDelay());
88-
assertEquals(Duration.millis(120000), options.getRetrySettings().getTotalTimeout());
89-
assertEquals(Duration.millis(250), options.getRetrySettings().getInitialRetryDelay());
87+
assertEquals(Duration.ofMillis(30000), options.getRetrySettings().getMaxRetryDelay());
88+
assertEquals(Duration.ofMillis(120000), options.getRetrySettings().getTotalTimeout());
89+
assertEquals(Duration.ofMillis(250), options.getRetrySettings().getInitialRetryDelay());
9090
}
9191

9292
@Test

‎google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
import java.util.Set;
4848
import java.util.regex.Matcher;
4949
import java.util.regex.Pattern;
50-
import org.joda.time.Duration;
5150
import org.json.JSONException;
5251
import org.json.JSONObject;
5352
import org.json.JSONTokener;
53+
import org.threeten.bp.Duration;
5454

5555
/**
5656
* Abstract class representing service options.
@@ -578,13 +578,13 @@ public static RetrySettings getNoRetrySettings() {
578578
private static RetrySettings.Builder getDefaultRetrySettingsBuilder() {
579579
return RetrySettings.newBuilder()
580580
.setMaxAttempts(6)
581-
.setInitialRetryDelay(Duration.millis(1000L))
582-
.setMaxRetryDelay(Duration.millis(32_000L))
581+
.setInitialRetryDelay(Duration.ofMillis(1000L))
582+
.setMaxRetryDelay(Duration.ofMillis(32_000L))
583583
.setRetryDelayMultiplier(2.0)
584-
.setTotalTimeout(Duration.millis(50_000L))
585-
.setInitialRpcTimeout(Duration.millis(50_000L))
584+
.setTotalTimeout(Duration.ofMillis(50_000L))
585+
.setInitialRpcTimeout(Duration.ofMillis(50_000L))
586586
.setRpcTimeoutMultiplier(1.0)
587-
.setMaxRpcTimeout(Duration.millis(50_000L));
587+
.setMaxRpcTimeout(Duration.ofMillis(50_000L));
588588
}
589589

590590
protected abstract Set<String> getScopes();

‎google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import java.util.logging.Logger;
5454
import java.util.zip.ZipEntry;
5555
import java.util.zip.ZipInputStream;
56-
import org.joda.time.Duration;
56+
import org.threeten.bp.Duration;
5757

5858
/**
5959
* Utility class to start and stop a local service which is used by unit testing.
@@ -149,7 +149,7 @@ public void run() {
149149
waiter.start();
150150

151151
try {
152-
return exitValue.get(timeout.getMillis(), TimeUnit.MILLISECONDS);
152+
return exitValue.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
153153
} catch (ExecutionException e) {
154154
if (e.getCause() instanceof InterruptedException) {
155155
throw (InterruptedException) e.getCause();

‎google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@
2020
import com.google.cloud.ServiceOptions;
2121
import com.google.cloud.testing.BaseEmulatorHelper.EmulatorRunner;
2222
import com.google.common.collect.ImmutableList;
23-
24-
import org.easymock.EasyMock;
25-
import org.joda.time.Duration;
26-
import org.junit.Test;
27-
2823
import java.io.ByteArrayInputStream;
2924
import java.io.IOException;
3025
import java.io.InputStream;
3126
import java.util.List;
3227
import java.util.concurrent.TimeoutException;
3328
import java.util.logging.Logger;
29+
import org.easymock.EasyMock;
30+
import org.junit.Test;
31+
import org.threeten.bp.Duration;
3432

3533
public class BaseEmulatorHelperTest {
3634

@@ -88,13 +86,13 @@ public void testEmulatorHelper() throws IOException, InterruptedException, Timeo
8886
emulatorRunner.start();
8987
EasyMock.expectLastCall();
9088
EasyMock.expect(emulatorRunner.getProcess()).andReturn(process);
91-
emulatorRunner.waitFor(Duration.standardMinutes(1));
89+
emulatorRunner.waitFor(Duration.ofMinutes(1));
9290
EasyMock.expectLastCall().andReturn(0);
9391
EasyMock.replay(process, emulatorRunner);
9492
TestEmulatorHelper helper =
9593
new TestEmulatorHelper(ImmutableList.of(emulatorRunner), BLOCK_UNTIL);
9694
helper.start();
97-
helper.stop(Duration.standardMinutes(1));
95+
helper.stop(Duration.ofMinutes(1));
9896
EasyMock.verify();
9997
}
10098

@@ -110,13 +108,13 @@ public void testEmulatorHelperMultipleRunners() throws IOException, InterruptedE
110108
secondRunner.start();
111109
EasyMock.expectLastCall();
112110
EasyMock.expect(secondRunner.getProcess()).andReturn(process);
113-
secondRunner.waitFor(Duration.standardMinutes(1));
111+
secondRunner.waitFor(Duration.ofMinutes(1));
114112
EasyMock.expectLastCall().andReturn(0);
115113
EasyMock.replay(process, secondRunner);
116114
TestEmulatorHelper helper =
117115
new TestEmulatorHelper(ImmutableList.of(firstRunner, secondRunner), BLOCK_UNTIL);
118116
helper.start();
119-
helper.stop(Duration.standardMinutes(1));
117+
helper.stop(Duration.ofMinutes(1));
120118
EasyMock.verify();
121119
}
122120
}

‎google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.cloud.testing.BaseEmulatorHelper;
2424
import com.google.common.collect.ImmutableList;
2525

26-
import org.joda.time.Duration;
26+
import org.threeten.bp.Duration;
2727

2828
import java.io.IOException;
2929
import java.net.MalformedURLException;

‎google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.google.cloud.datastore.StructuredQuery;
2828

2929
import java.util.UUID;
30-
import org.joda.time.Duration;
30+
import org.threeten.bp.Duration;
3131

3232
/**
3333
* Utility to create a remote datastore configuration for testing. Datastore options can be obtained
@@ -95,13 +95,13 @@ public static RemoteDatastoreHelper create() {
9595

9696
private static RetrySettings retrySettings() {
9797
return RetrySettings.newBuilder().setMaxAttempts(10)
98-
.setMaxRetryDelay(Duration.millis(30000L))
99-
.setTotalTimeout(Duration.millis(120000L))
100-
.setInitialRetryDelay(Duration.millis(250L))
98+
.setMaxRetryDelay(Duration.ofMillis(30000L))
99+
.setTotalTimeout(Duration.ofMillis(120000L))
100+
.setInitialRetryDelay(Duration.ofMillis(250L))
101101
.setRetryDelayMultiplier(1.0)
102-
.setInitialRpcTimeout(Duration.millis(120000L))
102+
.setInitialRpcTimeout(Duration.ofMillis(120000L))
103103
.setRpcTimeoutMultiplier(1.0)
104-
.setMaxRpcTimeout(Duration.millis(120000L))
104+
.setMaxRpcTimeout(Duration.ofMillis(120000L))
105105
.build();
106106
}
107107
}

‎google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import com.google.protobuf.ByteString;
4949

5050
import org.easymock.EasyMock;
51-
import org.joda.time.Duration;
51+
import org.threeten.bp.Duration;
5252
import org.junit.AfterClass;
5353
import org.junit.Before;
5454
import org.junit.BeforeClass;
@@ -154,7 +154,7 @@ public void setUp() {
154154

155155
@AfterClass
156156
public static void afterClass() throws IOException, InterruptedException, TimeoutException {
157-
helper.stop(Duration.standardMinutes(1));
157+
helper.stop(Duration.ofMinutes(1));
158158
}
159159

160160
@Test

0 commit comments

Comments
 (0)