Skip to content

Commit 18ef72a

Browse files
mziccardmziccard
committed
---
yaml --- r: 4849 b: refs/heads/logging-alpha c: 41f7ab7 h: refs/heads/master i: 4847: 7643080
1 parent b4179aa commit 18ef72a

6 files changed

Lines changed: 39 additions & 25 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
1212
refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
1313
refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
1414
refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
15-
refs/heads/logging-alpha: bf2a4084d1557876ad668d2e38eabcf79605dbaa
15+
refs/heads/logging-alpha: 41f7ab7ace6f6d4e0e7944eddb5e6400948a40fc
1616
refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
1717
refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
1818
refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f

‎branches/logging-alpha/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DeprecationStatus.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
package com.google.gcloud.compute;
1818

19-
import com.google.api.client.util.DateTime;
2019
import com.google.common.base.Function;
2120
import com.google.common.base.MoreObjects;
2221

22+
import org.joda.time.format.DateTimeFormatter;
23+
import org.joda.time.format.ISODateTimeFormat;
24+
2325
import java.io.Serializable;
2426
import java.util.Objects;
2527

@@ -31,6 +33,7 @@
3133
public final class DeprecationStatus<T extends ResourceId> implements Serializable {
3234

3335
private static final long serialVersionUID = -2695077634793679794L;
36+
private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
3437

3538
private final Long deleted;
3639
private final Long deprecated;
@@ -134,13 +137,13 @@ com.google.api.services.compute.model.DeprecationStatus toPb() {
134137
com.google.api.services.compute.model.DeprecationStatus deprecationStatusPb =
135138
new com.google.api.services.compute.model.DeprecationStatus();
136139
if (deleted != null) {
137-
deprecationStatusPb.setDeleted(new DateTime(deleted).toStringRfc3339());
140+
deprecationStatusPb.setDeleted(TIMESTAMP_FORMATTER.print(deleted));
138141
}
139142
if (deprecated != null) {
140-
deprecationStatusPb.setDeprecated(new DateTime(deprecated).toStringRfc3339());
143+
deprecationStatusPb.setDeprecated(TIMESTAMP_FORMATTER.print(deprecated));
141144
}
142145
if (obsolete != null) {
143-
deprecationStatusPb.setObsolete(new DateTime(obsolete).toStringRfc3339());
146+
deprecationStatusPb.setObsolete(TIMESTAMP_FORMATTER.print(obsolete));
144147
}
145148
if (replacement != null) {
146149
deprecationStatusPb.setReplacement(replacement.selfLink());
@@ -156,11 +159,11 @@ static <T extends ResourceId> DeprecationStatus<T> fromPb(
156159
Function<String, T> fromUrl) {
157160
return new DeprecationStatus<>(
158161
deprecationStatusPb.getDeleted() != null
159-
? DateTime.parseRfc3339(deprecationStatusPb.getDeleted()).getValue() : null,
162+
? TIMESTAMP_FORMATTER.parseMillis(deprecationStatusPb.getDeleted()) : null,
160163
deprecationStatusPb.getDeprecated() != null
161-
? DateTime.parseRfc3339(deprecationStatusPb.getDeprecated()).getValue() : null,
164+
? TIMESTAMP_FORMATTER.parseMillis(deprecationStatusPb.getDeprecated()) : null,
162165
deprecationStatusPb.getObsolete() != null
163-
? DateTime.parseRfc3339(deprecationStatusPb.getObsolete()).getValue() : null,
166+
? TIMESTAMP_FORMATTER.parseMillis(deprecationStatusPb.getObsolete()) : null,
164167
deprecationStatusPb.getReplacement() != null
165168
? fromUrl.apply(deprecationStatusPb.getReplacement()) : null,
166169
deprecationStatusPb.getState() != null

‎branches/logging-alpha/gcloud-java-compute/src/main/java/com/google/gcloud/compute/DiskType.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
package com.google.gcloud.compute;
1818

19-
import com.google.api.client.util.DateTime;
2019
import com.google.common.base.Function;
2120
import com.google.common.base.MoreObjects;
2221

22+
import org.joda.time.format.DateTimeFormatter;
23+
import org.joda.time.format.ISODateTimeFormat;
24+
2325
import java.io.Serializable;
2426
import java.math.BigInteger;
2527
import java.util.Objects;
@@ -48,6 +50,7 @@ public com.google.api.services.compute.model.DiskType apply(DiskType diskType) {
4850
};
4951

5052
private static final long serialVersionUID = -944042261695072026L;
53+
private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
5154

5255
private final String id;
5356
private final DiskTypeId diskTypeId;
@@ -199,7 +202,7 @@ com.google.api.services.compute.model.DiskType toPb() {
199202
diskTypePb.setId(new BigInteger(id));
200203
}
201204
if (creationTimestamp != null) {
202-
diskTypePb.setCreationTimestamp(new DateTime(creationTimestamp).toStringRfc3339());
205+
diskTypePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
203206
}
204207
diskTypePb.setDescription(description);
205208
diskTypePb.setValidDiskSize(validDiskSize);
@@ -222,8 +225,7 @@ static DiskType fromPb(com.google.api.services.compute.model.DiskType diskTypePb
222225
builder.id(diskTypePb.getId().toString());
223226
}
224227
if (diskTypePb.getCreationTimestamp() != null) {
225-
builder.creationTimestamp(
226-
DateTime.parseRfc3339(diskTypePb.getCreationTimestamp()).getValue());
228+
builder.creationTimestamp(TIMESTAMP_FORMATTER.parseMillis(diskTypePb.getCreationTimestamp()));
227229
}
228230
builder.diskTypeId(DiskTypeId.fromUrl(diskTypePb.getSelfLink()));
229231
builder.description(diskTypePb.getDescription());

‎branches/logging-alpha/gcloud-java-compute/src/main/java/com/google/gcloud/compute/MachineType.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
package com.google.gcloud.compute;
1818

19-
import com.google.api.client.util.DateTime;
2019
import com.google.api.services.compute.model.MachineType.ScratchDisks;
2120
import com.google.common.base.Function;
2221
import com.google.common.base.MoreObjects;
2322
import com.google.common.collect.Lists;
2423

24+
import org.joda.time.format.DateTimeFormatter;
25+
import org.joda.time.format.ISODateTimeFormat;
26+
2527
import java.io.Serializable;
2628
import java.math.BigInteger;
2729
import java.util.List;
@@ -52,6 +54,7 @@ public com.google.api.services.compute.model.MachineType apply(MachineType type)
5254
return type.toPb();
5355
}
5456
};
57+
private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
5558

5659
private static final long serialVersionUID = -4210962597502860450L;
5760

@@ -255,7 +258,7 @@ com.google.api.services.compute.model.MachineType toPb() {
255258
machineTypePb.setId(new BigInteger(id));
256259
}
257260
if (creationTimestamp != null) {
258-
machineTypePb.setCreationTimestamp(new DateTime(creationTimestamp).toStringRfc3339());
261+
machineTypePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
259262
}
260263
machineTypePb.setName(machineTypeId.machineType());
261264
machineTypePb.setDescription(description);
@@ -292,7 +295,7 @@ static MachineType fromPb(com.google.api.services.compute.model.MachineType mach
292295
}
293296
if (machineTypePb.getCreationTimestamp() != null) {
294297
builder.creationTimestamp(
295-
DateTime.parseRfc3339(machineTypePb.getCreationTimestamp()).getValue());
298+
TIMESTAMP_FORMATTER.parseMillis(machineTypePb.getCreationTimestamp()));
296299
}
297300
builder.description(machineTypePb.getDescription());
298301
builder.cpus(machineTypePb.getGuestCpus());

‎branches/logging-alpha/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Region.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
package com.google.gcloud.compute;
1818

19-
import com.google.api.client.util.DateTime;
2019
import com.google.common.base.Function;
2120
import com.google.common.base.MoreObjects;
2221
import com.google.common.collect.ImmutableList;
2322
import com.google.common.collect.Lists;
2423

24+
import org.joda.time.format.DateTimeFormatter;
25+
import org.joda.time.format.ISODateTimeFormat;
26+
2527
import java.io.Serializable;
2628
import java.math.BigInteger;
2729
import java.util.List;
@@ -50,6 +52,7 @@ public com.google.api.services.compute.model.Region apply(Region region) {
5052
};
5153

5254
private static final long serialVersionUID = -3578710133393645135L;
55+
private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
5356

5457
private final RegionId regionId;
5558
private final String id;
@@ -319,7 +322,7 @@ com.google.api.services.compute.model.Region toPb() {
319322
regionPb.setId(new BigInteger(id));
320323
}
321324
if (creationTimestamp != null) {
322-
regionPb.setCreationTimestamp(new DateTime(creationTimestamp).toStringRfc3339());
325+
regionPb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
323326
}
324327
regionPb.setName(regionId.region());
325328
regionPb.setDescription(description);
@@ -350,7 +353,7 @@ static Region fromPb(com.google.api.services.compute.model.Region regionPb) {
350353
builder.id(regionPb.getId().toString());
351354
}
352355
if (regionPb.getCreationTimestamp() != null) {
353-
builder.creationTimestamp(DateTime.parseRfc3339(regionPb.getCreationTimestamp()).getValue());
356+
builder.creationTimestamp(TIMESTAMP_FORMATTER.parseMillis(regionPb.getCreationTimestamp()));
354357
}
355358
builder.description(regionPb.getDescription());
356359
if (regionPb.getStatus() != null) {

‎branches/logging-alpha/gcloud-java-compute/src/main/java/com/google/gcloud/compute/Zone.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
package com.google.gcloud.compute;
1818

19-
import com.google.api.client.util.DateTime;
2019
import com.google.api.services.compute.model.Zone.MaintenanceWindows;
2120
import com.google.common.base.Function;
2221
import com.google.common.base.MoreObjects;
2322
import com.google.common.collect.Lists;
2423

24+
import org.joda.time.format.DateTimeFormatter;
25+
import org.joda.time.format.ISODateTimeFormat;
26+
2527
import java.io.Serializable;
2628
import java.math.BigInteger;
2729
import java.util.List;
@@ -50,6 +52,7 @@ public com.google.api.services.compute.model.Zone apply(Zone region) {
5052
};
5153

5254
private static final long serialVersionUID = 6113636504417213010L;
55+
private static final DateTimeFormatter TIMESTAMP_FORMATTER = ISODateTimeFormat.dateTime();
5356

5457
private final ZoneId zoneId;
5558
private final String id;
@@ -162,16 +165,16 @@ MaintenanceWindows toPb() {
162165
return new MaintenanceWindows()
163166
.setName(name)
164167
.setDescription(description)
165-
.setBeginTime(beginTime != null ? new DateTime(beginTime).toStringRfc3339() : null)
166-
.setEndTime(endTime != null ? new DateTime(endTime).toStringRfc3339() : null);
168+
.setBeginTime(beginTime != null ? TIMESTAMP_FORMATTER.print(beginTime) : null)
169+
.setEndTime(endTime != null ? TIMESTAMP_FORMATTER.print(endTime) : null);
167170
}
168171

169172
static MaintenanceWindow fromPb(MaintenanceWindows windowPb) {
170173
return new MaintenanceWindow(windowPb.getName(), windowPb.getDescription(),
171174
windowPb.getBeginTime() != null
172-
? DateTime.parseRfc3339(windowPb.getBeginTime()).getValue() : null,
175+
? TIMESTAMP_FORMATTER.parseMillis(windowPb.getBeginTime()) : null,
173176
windowPb.getEndTime() != null
174-
? DateTime.parseRfc3339(windowPb.getEndTime()).getValue() : null);
177+
? TIMESTAMP_FORMATTER.parseMillis(windowPb.getEndTime()) : null);
175178
}
176179
}
177180

@@ -338,7 +341,7 @@ com.google.api.services.compute.model.Zone toPb() {
338341
zonePb.setId(new BigInteger(id));
339342
}
340343
if (creationTimestamp != null) {
341-
zonePb.setCreationTimestamp(new DateTime(creationTimestamp).toStringRfc3339());
344+
zonePb.setCreationTimestamp(TIMESTAMP_FORMATTER.print(creationTimestamp));
342345
}
343346
zonePb.setName(zoneId.zone());
344347
zonePb.setDescription(description);
@@ -370,7 +373,7 @@ static Zone fromPb(com.google.api.services.compute.model.Zone zonePb) {
370373
builder.id(zonePb.getId().toString());
371374
}
372375
if (zonePb.getCreationTimestamp() != null) {
373-
builder.creationTimestamp(DateTime.parseRfc3339(zonePb.getCreationTimestamp()).getValue());
376+
builder.creationTimestamp(TIMESTAMP_FORMATTER.parseMillis(zonePb.getCreationTimestamp()));
374377
}
375378
builder.description(zonePb.getDescription());
376379
if (zonePb.getStatus() != null) {

0 commit comments

Comments
 (0)