Skip to content

Commit 8ef362e

Browse files
sduskissduskis
authored
Removing non-deprecated uses of joda time. (googleapis#4351)
* Removing non-deprecated uses of joda time. This works towards googleapis#3482 * Update pom.xml * Ran `mvn com.coveo:fmt-maven-plugin:format` * Fixing a bad merge
1 parent 9f2b2bb commit 8ef362e

9 files changed

Lines changed: 63 additions & 35 deletions

File tree

‎google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929
import javax.annotation.Nullable;
30-
import org.joda.time.DateTimeZone;
31-
import org.joda.time.format.DateTimeFormat;
32-
import org.joda.time.format.DateTimeFormatter;
30+
import org.threeten.bp.Instant;
31+
import org.threeten.bp.ZoneOffset;
32+
import org.threeten.bp.format.DateTimeFormatter;
33+
import org.threeten.bp.format.DateTimeParseException;
3334

3435
/**
3536
* A value for a QueryParameter along with its type.
@@ -60,12 +61,12 @@
6061
public abstract class QueryParameterValue implements Serializable {
6162

6263
private static final DateTimeFormatter timestampFormatter =
63-
DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSSSSSZZ").withZone(DateTimeZone.UTC);
64-
private static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd");
64+
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx").withZone(ZoneOffset.UTC);
65+
private static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
6566
private static final DateTimeFormatter timeFormatter =
66-
DateTimeFormat.forPattern("HH:mm:ss.SSSSSS");
67+
DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSS");
6768
private static final DateTimeFormatter datetimeFormatter =
68-
DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
69+
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
6970

7071
static final Function<
7172
QueryParameterValue, com.google.api.services.bigquery.model.QueryParameterValue>
@@ -297,31 +298,31 @@ private static <T> String valueToStringOrNull(T value, StandardSQLTypeName type)
297298
throw new IllegalArgumentException("Cannot convert ARRAY to String value");
298299
case TIMESTAMP:
299300
if (value instanceof Long) {
300-
return timestampFormatter.print(((Long) value) / 1000);
301+
return timestampFormatter.format(Instant.ofEpochMilli(((Long) value) / 1000));
301302
} else if (value instanceof String) {
302303
// verify that the String is in the right format
303-
timestampFormatter.parseMillis((String) value);
304+
checkFormat(value, timestampFormatter);
304305
return (String) value;
305306
}
306307
break;
307308
case DATE:
308309
if (value instanceof String) {
309310
// verify that the String is in the right format
310-
dateFormatter.parseMillis((String) value);
311+
checkFormat(value, dateFormatter);
311312
return (String) value;
312313
}
313314
break;
314315
case TIME:
315316
if (value instanceof String) {
316317
// verify that the String is in the right format
317-
timeFormatter.parseMillis((String) value);
318+
checkFormat(value, timeFormatter);
318319
return (String) value;
319320
}
320321
break;
321322
case DATETIME:
322323
if (value instanceof String) {
323324
// verify that the String is in the right format
324-
datetimeFormatter.parseMillis((String) value);
325+
checkFormat(value, datetimeFormatter);
325326
return (String) value;
326327
}
327328
break;
@@ -332,6 +333,14 @@ private static <T> String valueToStringOrNull(T value, StandardSQLTypeName type)
332333
"Type " + type + " incompatible with " + value.getClass().getCanonicalName());
333334
}
334335

336+
private static void checkFormat(Object value, DateTimeFormatter formatter) {
337+
try {
338+
formatter.parse((String) value);
339+
} catch (DateTimeParseException e) {
340+
throw new IllegalArgumentException(e.getMessage(), e);
341+
}
342+
}
343+
335344
/** Returns a builder for a QueryParameterValue object with given value. */
336345
public abstract Builder toBuilder();
337346

‎google-cloud-clients/google-cloud-compute/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<artifactId>google-api-services-compute</artifactId>
3232
<scope>compile</scope>
3333
</dependency>
34+
<dependency>
35+
<groupId>joda-time</groupId>
36+
<artifactId>joda-time</artifactId>
37+
<scope>compile</scope>
38+
</dependency>
3439

3540
<!-- Test dependencies -->
3641
<dependency>

‎google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<pattern>org</pattern>
113113
<shadedPattern>shaded.cloud_nio.org</shadedPattern>
114114
<includes>
115-
<include>org.joda.**</include>
116115
<include>org.apache.**</include>
117116
<include>org.threeten.**</include>
118117
<include>org.codehaus.**</include>

‎google-cloud-clients/google-cloud-core/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<artifactId>junit</artifactId>
2828
<scope>test</scope>
2929
</dependency>
30-
<dependency>
31-
<groupId>joda-time</groupId>
32-
<artifactId>joda-time</artifactId>
33-
<scope>compile</scope>
34-
</dependency>
3530
<dependency>
3631
<groupId>com.google.http-client</groupId>
3732
<artifactId>google-http-client</artifactId>

‎google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.threeten.bp.Instant;
2727
import org.threeten.bp.LocalDateTime;
2828
import org.threeten.bp.ZoneOffset;
29-
import org.threeten.bp.chrono.IsoChronology;
3029
import org.threeten.bp.format.DateTimeFormatter;
3130

3231
/**
@@ -46,8 +45,7 @@ public final class Timestamp implements Comparable<Timestamp>, Serializable {
4645
public static final Timestamp MAX_VALUE =
4746
new Timestamp(253402300799L, (int) TimeUnit.SECONDS.toNanos(1) - 1);
4847

49-
private static final DateTimeFormatter format =
50-
DateTimeFormatter.ISO_LOCAL_DATE_TIME.withChronology(IsoChronology.INSTANCE);
48+
private static final DateTimeFormatter format = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
5149

5250
private final long seconds;
5351
private final int nanos;

‎google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
import java.util.LinkedList;
3131
import java.util.List;
3232
import java.util.Objects;
33-
import org.joda.time.DateTime;
34-
import org.joda.time.format.ISODateTimeFormat;
33+
import org.threeten.bp.Instant;
34+
import org.threeten.bp.ZoneOffset;
35+
import org.threeten.bp.format.DateTimeFormatter;
3536

3637
/**
3738
* A class representing an atomic update to a collection of {@link RecordSet}s within a {@code
@@ -328,7 +329,10 @@ Change toPb() {
328329
}
329330
// set timestamp
330331
if (getStartTimeMillis() != null) {
331-
pb.setStartTime(ISODateTimeFormat.dateTime().withZoneUTC().print(getStartTimeMillis()));
332+
pb.setStartTime(
333+
DateTimeFormatter.ISO_DATE_TIME
334+
.withZone(ZoneOffset.UTC)
335+
.format(Instant.ofEpochMilli(getStartTimeMillis())));
332336
}
333337
// set status
334338
if (status() != null) {
@@ -347,7 +351,8 @@ static ChangeRequestInfo fromPb(Change pb) {
347351
builder.setGeneratedId(pb.getId());
348352
}
349353
if (pb.getStartTime() != null) {
350-
builder.setStartTime(DateTime.parse(pb.getStartTime()).getMillis());
354+
builder.setStartTime(
355+
DateTimeFormatter.ISO_DATE_TIME.parse(pb.getStartTime(), Instant.FROM).toEpochMilli());
351356
}
352357
if (pb.getStatus() != null) {
353358
// we are assuming that status indicated in pb is a lower case version of the enum name

‎google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
import java.math.BigInteger;
2727
import java.util.List;
2828
import java.util.Objects;
29-
import org.joda.time.DateTime;
30-
import org.joda.time.format.ISODateTimeFormat;
29+
import org.threeten.bp.Instant;
30+
import org.threeten.bp.ZoneOffset;
31+
import org.threeten.bp.format.DateTimeFormatter;
3132

3233
/**
3334
* A {@code Zone} represents a DNS zone hosted by the Google Cloud DNS service. A zone is a subtree
@@ -38,6 +39,9 @@
3839
public class ZoneInfo implements Serializable {
3940

4041
private static final long serialVersionUID = -5313169712036079818L;
42+
private static final DateTimeFormatter DATE_TIME_FORMATTER =
43+
DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
44+
4145
private final String name;
4246
private final String generatedId;
4347
private final Long creationTimeMillis;
@@ -234,7 +238,7 @@ ManagedZone toPb() {
234238
pb.setNameServerSet(this.getNameServerSet());
235239
if (this.getCreationTimeMillis() != null) {
236240
pb.setCreationTime(
237-
ISODateTimeFormat.dateTime().withZoneUTC().print(this.getCreationTimeMillis()));
241+
DATE_TIME_FORMATTER.format(Instant.ofEpochMilli(this.getCreationTimeMillis())));
238242
}
239243
return pb;
240244
}
@@ -257,7 +261,8 @@ static ZoneInfo fromPb(ManagedZone pb) {
257261
builder.setNameServerSet(pb.getNameServerSet());
258262
}
259263
if (pb.getCreationTime() != null) {
260-
builder.setCreationTimeMillis(DateTime.parse(pb.getCreationTime()).getMillis());
264+
builder.setCreationTimeMillis(
265+
DATE_TIME_FORMATTER.parse(pb.getCreationTime(), Instant.FROM).toEpochMilli());
261266
}
262267
return builder.build();
263268
}

‎google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
import java.util.HashMap;
3030
import java.util.Map;
3131
import java.util.Objects;
32-
import org.joda.time.DateTime;
33-
import org.joda.time.format.ISODateTimeFormat;
32+
import org.threeten.bp.Instant;
33+
import org.threeten.bp.ZoneOffset;
34+
import org.threeten.bp.format.DateTimeFormatter;
3435

3536
/**
3637
* A Google Cloud Resource Manager project metadata object. A Project is a high-level Google Cloud
@@ -39,6 +40,8 @@
3940
*/
4041
public class ProjectInfo implements Serializable {
4142

43+
public static final DateTimeFormatter DATE_TIME_FORMATTER =
44+
DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC);
4245
private static final long serialVersionUID = 9148970963697734236L;
4346
private final String name;
4447
private final String projectId;
@@ -390,7 +393,10 @@ com.google.api.services.cloudresourcemanager.model.Project toPb() {
390393
projectPb.setLifecycleState(state.toString());
391394
}
392395
if (createTimeMillis != null) {
393-
projectPb.setCreateTime(ISODateTimeFormat.dateTime().withZoneUTC().print(createTimeMillis));
396+
projectPb.setCreateTime(
397+
DateTimeFormatter.ISO_DATE_TIME
398+
.withZone(ZoneOffset.UTC)
399+
.format(Instant.ofEpochMilli(createTimeMillis)));
394400
}
395401
if (parent != null) {
396402
projectPb.setParent(parent.toPb());
@@ -411,7 +417,8 @@ static ProjectInfo fromPb(com.google.api.services.cloudresourcemanager.model.Pro
411417
builder.setState(State.valueOf(projectPb.getLifecycleState()));
412418
}
413419
if (projectPb.getCreateTime() != null) {
414-
builder.setCreateTimeMillis(DateTime.parse(projectPb.getCreateTime()).getMillis());
420+
builder.setCreateTimeMillis(
421+
DATE_TIME_FORMATTER.parse(projectPb.getCreateTime(), Instant.FROM).toEpochMilli());
415422
}
416423
if (projectPb.getParent() != null) {
417424
builder.setParent(ResourceId.fromPb(projectPb.getParent()));

‎google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@
6161
import java.util.regex.Matcher;
6262
import java.util.regex.Pattern;
6363
import java.util.zip.GZIPInputStream;
64-
import org.joda.time.format.ISODateTimeFormat;
64+
import org.threeten.bp.Instant;
65+
import org.threeten.bp.ZoneOffset;
66+
import org.threeten.bp.format.DateTimeFormatter;
6567

6668
/**
6769
* Utility to create a local Resource Manager mock for testing.
@@ -443,7 +445,10 @@ synchronized Response create(Project project) {
443445
} else {
444446
project.setLifecycleState("ACTIVE");
445447
project.setProjectNumber(Math.abs(PROJECT_NUMBER_GENERATOR.nextLong() % Long.MAX_VALUE));
446-
project.setCreateTime(ISODateTimeFormat.dateTime().print(System.currentTimeMillis()));
448+
project.setCreateTime(
449+
DateTimeFormatter.ISO_DATE_TIME
450+
.withZone(ZoneOffset.UTC)
451+
.format(Instant.ofEpochMilli(System.currentTimeMillis())));
447452
if (projects.putIfAbsent(project.getProjectId(), project) != null) {
448453
return Error.ALREADY_EXISTS.response(
449454
"A project with the same project ID (" + project.getProjectId() + ") already exists.");

0 commit comments

Comments
 (0)