Skip to content

Commit 9cc9609

Browse files
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 e23b5c0 commit 9cc9609

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

java-resourcemanager/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()));

java-resourcemanager/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)