From fc8438b6a6ad8b1877b086b8fa1481994bf0a3bf Mon Sep 17 00:00:00 2001 From: Solomon Duskis Date: Wed, 16 Jan 2019 15:03:51 -0800 Subject: [PATCH 1/4] Removing non-deprecated uses of joda time. This works towards #3482 --- .../cloud/bigquery/QueryParameterValue.java | 34 ++++++++++++------- .../google-cloud-compute/pom.xml | 5 +++ .../google-cloud-nio/pom.xml | 1 - .../google-cloud-core/pom.xml | 5 --- .../main/java/com/google/cloud/Timestamp.java | 3 +- google-cloud-clients/google-cloud-dns/pom.xml | 5 +++ .../google/cloud/dns/ChangeRequestInfo.java | 12 ++++--- .../java/com/google/cloud/dns/ZoneInfo.java | 19 ++++++++--- .../cloud/resourcemanager/ProjectInfo.java | 14 +++++--- .../testing/LocalResourceManagerHelper.java | 9 +++-- .../google-cloud-spanner/pom.xml | 4 --- 11 files changed, 72 insertions(+), 39 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java index d74fc005f35c..7bcb6a5b2905 100644 --- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java +++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java @@ -22,14 +22,16 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.io.BaseEncoding; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; +import org.threeten.bp.format.DateTimeParseException; + import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.joda.time.DateTimeZone; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; /** * A value for a QueryParameter along with its type. @@ -60,12 +62,12 @@ public abstract class QueryParameterValue implements Serializable { private static final DateTimeFormatter timestampFormatter = - DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSSSSSZZ").withZone(DateTimeZone.UTC); - private static final DateTimeFormatter dateFormatter = DateTimeFormat.forPattern("yyyy-MM-dd"); + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx").withZone(ZoneOffset.UTC); + private static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); private static final DateTimeFormatter timeFormatter = - DateTimeFormat.forPattern("HH:mm:ss.SSSSSS"); + DateTimeFormatter.ofPattern("HH:mm:ss.SSSSSS"); private static final DateTimeFormatter datetimeFormatter = - DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSSSSS"); + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS"); static final Function< QueryParameterValue, com.google.api.services.bigquery.model.QueryParameterValue> @@ -297,31 +299,31 @@ private static String valueToStringOrNull(T value, StandardSQLTypeName type) throw new IllegalArgumentException("Cannot convert ARRAY to String value"); case TIMESTAMP: if (value instanceof Long) { - return timestampFormatter.print(((Long) value) / 1000); + return timestampFormatter.format(Instant.ofEpochMilli(((Long) value) / 1000)); } else if (value instanceof String) { // verify that the String is in the right format - timestampFormatter.parseMillis((String) value); + checkFormat(value, timestampFormatter); return (String) value; } break; case DATE: if (value instanceof String) { // verify that the String is in the right format - dateFormatter.parseMillis((String) value); + checkFormat(value, dateFormatter); return (String) value; } break; case TIME: if (value instanceof String) { // verify that the String is in the right format - timeFormatter.parseMillis((String) value); + checkFormat(value, timeFormatter); return (String) value; } break; case DATETIME: if (value instanceof String) { // verify that the String is in the right format - datetimeFormatter.parseMillis((String) value); + checkFormat(value, datetimeFormatter); return (String) value; } break; @@ -332,6 +334,14 @@ private static String valueToStringOrNull(T value, StandardSQLTypeName type) "Type " + type + " incompatible with " + value.getClass().getCanonicalName()); } + private static void checkFormat(Object value, DateTimeFormatter formatter) { + try { + formatter.parse((String) value); + } catch (DateTimeParseException e) { + throw new IllegalArgumentException(e.getMessage(), e); + } + } + /** Returns a builder for a QueryParameterValue object with given value. */ public abstract Builder toBuilder(); diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml index 88ee7d510ad8..8b76db4b82b2 100644 --- a/google-cloud-clients/google-cloud-compute/pom.xml +++ b/google-cloud-clients/google-cloud-compute/pom.xml @@ -31,6 +31,11 @@ google-api-services-compute compile + + joda-time + joda-time + compile + diff --git a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml index 567575c73bfa..63758e4b9310 100644 --- a/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml +++ b/google-cloud-clients/google-cloud-contrib/google-cloud-nio/pom.xml @@ -112,7 +112,6 @@ org shaded.cloud_nio.org - org.joda.** org.apache.** org.threeten.** org.codehaus.** diff --git a/google-cloud-clients/google-cloud-core/pom.xml b/google-cloud-clients/google-cloud-core/pom.xml index 242b8d07fc11..224bbb681be0 100644 --- a/google-cloud-clients/google-cloud-core/pom.xml +++ b/google-cloud-clients/google-cloud-core/pom.xml @@ -27,11 +27,6 @@ junit test - - joda-time - joda-time - compile - com.google.http-client google-http-client diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java index dc44f8abea10..d8aa60f32009 100644 --- a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java +++ b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java @@ -26,7 +26,6 @@ import org.threeten.bp.Instant; import org.threeten.bp.LocalDateTime; import org.threeten.bp.ZoneOffset; -import org.threeten.bp.chrono.IsoChronology; import org.threeten.bp.format.DateTimeFormatter; /** @@ -47,7 +46,7 @@ public final class Timestamp implements Comparable, Serializable { new Timestamp(253402300799L, (int) TimeUnit.SECONDS.toNanos(1) - 1); private static final DateTimeFormatter format = - DateTimeFormatter.ISO_LOCAL_DATE_TIME.withChronology(IsoChronology.INSTANCE); + DateTimeFormatter.ISO_LOCAL_DATE_TIME; private final long seconds; private final int nanos; diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml index 81822d5d188e..de6904ad364d 100644 --- a/google-cloud-clients/google-cloud-dns/pom.xml +++ b/google-cloud-clients/google-cloud-dns/pom.xml @@ -60,5 +60,10 @@ objenesis test + + joda-time + joda-time + test + diff --git a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java index fa93b4f7c161..6d306ce32101 100644 --- a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java +++ b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java @@ -26,12 +26,14 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; + import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Objects; -import org.joda.time.DateTime; -import org.joda.time.format.ISODateTimeFormat; /** * A class representing an atomic update to a collection of {@link RecordSet}s within a {@code @@ -328,7 +330,8 @@ Change toPb() { } // set timestamp if (getStartTimeMillis() != null) { - pb.setStartTime(ISODateTimeFormat.dateTime().withZoneUTC().print(getStartTimeMillis())); + pb.setStartTime(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC) + .format(Instant.ofEpochMilli(getStartTimeMillis()))); } // set status if (status() != null) { @@ -347,7 +350,8 @@ static ChangeRequestInfo fromPb(Change pb) { builder.setGeneratedId(pb.getId()); } if (pb.getStartTime() != null) { - builder.setStartTime(DateTime.parse(pb.getStartTime()).getMillis()); + builder.setStartTime( + DateTimeFormatter.ISO_DATE_TIME.parse(pb.getStartTime(), Instant.FROM).toEpochMilli()); } if (pb.getStatus() != null) { // we are assuming that status indicated in pb is a lower case version of the enum name diff --git a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java index bc0592dd3ff4..aa3e3906df47 100644 --- a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java +++ b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java @@ -22,12 +22,17 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import org.threeten.bp.Instant; +import org.threeten.bp.LocalDateTime; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; +import org.threeten.bp.temporal.TemporalAccessor; +import org.threeten.bp.temporal.TemporalField; + import java.io.Serializable; import java.math.BigInteger; import java.util.List; import java.util.Objects; -import org.joda.time.DateTime; -import org.joda.time.format.ISODateTimeFormat; /** * A {@code Zone} represents a DNS zone hosted by the Google Cloud DNS service. A zone is a subtree @@ -38,6 +43,9 @@ public class ZoneInfo implements Serializable { private static final long serialVersionUID = -5313169712036079818L; + private static final DateTimeFormatter DATE_TIME_FORMATTER = + DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC); + private final String name; private final String generatedId; private final Long creationTimeMillis; @@ -233,8 +241,8 @@ ManagedZone toPb() { pb.setNameServers(this.nameServers); // do use real attribute value which may be null pb.setNameServerSet(this.getNameServerSet()); if (this.getCreationTimeMillis() != null) { - pb.setCreationTime( - ISODateTimeFormat.dateTime().withZoneUTC().print(this.getCreationTimeMillis())); + pb.setCreationTime(DATE_TIME_FORMATTER + .format(Instant.ofEpochMilli(this.getCreationTimeMillis()))); } return pb; } @@ -257,7 +265,8 @@ static ZoneInfo fromPb(ManagedZone pb) { builder.setNameServerSet(pb.getNameServerSet()); } if (pb.getCreationTime() != null) { - builder.setCreationTimeMillis(DateTime.parse(pb.getCreationTime()).getMillis()); + builder.setCreationTimeMillis( + DATE_TIME_FORMATTER.parse(pb.getCreationTime(), Instant.FROM).toEpochMilli()); } return builder.build(); } diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java index 75e2021b6194..53986b8e21b1 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java @@ -25,12 +25,14 @@ import com.google.cloud.StringEnumValue; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.joda.time.DateTime; -import org.joda.time.format.ISODateTimeFormat; /** * A Google Cloud Resource Manager project metadata object. A Project is a high-level Google Cloud @@ -39,6 +41,8 @@ */ public class ProjectInfo implements Serializable { + public static final DateTimeFormatter DATE_TIME_FORMATTER = + DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC); private static final long serialVersionUID = 9148970963697734236L; private final String name; private final String projectId; @@ -390,7 +394,8 @@ com.google.api.services.cloudresourcemanager.model.Project toPb() { projectPb.setLifecycleState(state.toString()); } if (createTimeMillis != null) { - projectPb.setCreateTime(ISODateTimeFormat.dateTime().withZoneUTC().print(createTimeMillis)); + projectPb.setCreateTime(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC) + .format(Instant.ofEpochMilli(createTimeMillis))); } if (parent != null) { projectPb.setParent(parent.toPb()); @@ -411,7 +416,8 @@ static ProjectInfo fromPb(com.google.api.services.cloudresourcemanager.model.Pro builder.setState(State.valueOf(projectPb.getLifecycleState())); } if (projectPb.getCreateTime() != null) { - builder.setCreateTimeMillis(DateTime.parse(projectPb.getCreateTime()).getMillis()); + builder.setCreateTimeMillis( + DATE_TIME_FORMATTER.parse(projectPb.getCreateTime(), Instant.FROM).toEpochMilli()); } if (projectPb.getParent() != null) { builder.setParent(ResourceId.fromPb(projectPb.getParent())); diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java index 70163f00f6a3..35ce4f94ca7a 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java @@ -21,6 +21,7 @@ import static java.net.HttpURLConnection.HTTP_OK; import com.google.api.client.json.JsonFactory; +import com.google.api.client.util.DateTime; import com.google.api.services.cloudresourcemanager.model.Binding; import com.google.api.services.cloudresourcemanager.model.Operation; import com.google.api.services.cloudresourcemanager.model.Policy; @@ -40,6 +41,10 @@ import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -61,7 +66,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; -import org.joda.time.format.ISODateTimeFormat; /** * Utility to create a local Resource Manager mock for testing. @@ -443,7 +447,8 @@ synchronized Response create(Project project) { } else { project.setLifecycleState("ACTIVE"); project.setProjectNumber(Math.abs(PROJECT_NUMBER_GENERATOR.nextLong() % Long.MAX_VALUE)); - project.setCreateTime(ISODateTimeFormat.dateTime().print(System.currentTimeMillis())); + project.setCreateTime(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC) + .format(Instant.ofEpochMilli(System.currentTimeMillis()))); if (projects.putIfAbsent(project.getProjectId(), project) != null) { return Error.ALREADY_EXISTS.response( "A project with the same project ID (" + project.getProjectId() + ") already exists."); diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml index f5d89d02698e..84aae33591aa 100644 --- a/google-cloud-clients/google-cloud-spanner/pom.xml +++ b/google-cloud-clients/google-cloud-spanner/pom.xml @@ -129,10 +129,6 @@ com.google.code.findbugs jsr305 - - joda-time - joda-time - junit junit From efec2dddaaaec532fcffb5f8ef9f48a6a2819374 Mon Sep 17 00:00:00 2001 From: Solomon Duskis Date: Wed, 16 Jan 2019 15:10:36 -0800 Subject: [PATCH 2/4] Update pom.xml --- google-cloud-clients/google-cloud-dns/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml index de6904ad364d..81822d5d188e 100644 --- a/google-cloud-clients/google-cloud-dns/pom.xml +++ b/google-cloud-clients/google-cloud-dns/pom.xml @@ -60,10 +60,5 @@ objenesis test - - joda-time - joda-time - test - From a9614055b8619438f98d1f4afe909789b0357b12 Mon Sep 17 00:00:00 2001 From: Solomon Duskis Date: Wed, 16 Jan 2019 15:27:39 -0800 Subject: [PATCH 3/4] Ran `mvn com.coveo:fmt-maven-plugin:format` --- .../google/cloud/bigquery/QueryParameterValue.java | 9 ++++----- .../src/main/java/com/google/cloud/Timestamp.java | 3 +-- .../com/google/cloud/dns/ChangeRequestInfo.java | 13 +++++++------ .../main/java/com/google/cloud/dns/ZoneInfo.java | 14 +++++--------- .../google/cloud/resourcemanager/ProjectInfo.java | 13 +++++++------ .../testing/LocalResourceManagerHelper.java | 14 +++++++------- 6 files changed, 31 insertions(+), 35 deletions(-) diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java index 7bcb6a5b2905..5bf6b4e9f93a 100644 --- a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java +++ b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java @@ -22,16 +22,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.io.BaseEncoding; -import org.threeten.bp.Instant; -import org.threeten.bp.ZoneOffset; -import org.threeten.bp.format.DateTimeFormatter; -import org.threeten.bp.format.DateTimeParseException; - import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; +import org.threeten.bp.format.DateTimeParseException; /** * A value for a QueryParameter along with its type. diff --git a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java index d8aa60f32009..02bb98131366 100644 --- a/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java +++ b/google-cloud-clients/google-cloud-core/src/main/java/com/google/cloud/Timestamp.java @@ -45,8 +45,7 @@ public final class Timestamp implements Comparable, Serializable { public static final Timestamp MAX_VALUE = new Timestamp(253402300799L, (int) TimeUnit.SECONDS.toNanos(1) - 1); - private static final DateTimeFormatter format = - DateTimeFormatter.ISO_LOCAL_DATE_TIME; + private static final DateTimeFormatter format = DateTimeFormatter.ISO_LOCAL_DATE_TIME; private final long seconds; private final int nanos; diff --git a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java index 6d306ce32101..a7802045e068 100644 --- a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java +++ b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ChangeRequestInfo.java @@ -26,14 +26,13 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.threeten.bp.Instant; -import org.threeten.bp.ZoneOffset; -import org.threeten.bp.format.DateTimeFormatter; - import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Objects; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; /** * A class representing an atomic update to a collection of {@link RecordSet}s within a {@code @@ -330,8 +329,10 @@ Change toPb() { } // set timestamp if (getStartTimeMillis() != null) { - pb.setStartTime(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC) - .format(Instant.ofEpochMilli(getStartTimeMillis()))); + pb.setStartTime( + DateTimeFormatter.ISO_DATE_TIME + .withZone(ZoneOffset.UTC) + .format(Instant.ofEpochMilli(getStartTimeMillis()))); } // set status if (status() != null) { diff --git a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java index aa3e3906df47..a66167341793 100644 --- a/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java +++ b/google-cloud-clients/google-cloud-dns/src/main/java/com/google/cloud/dns/ZoneInfo.java @@ -22,17 +22,13 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.threeten.bp.Instant; -import org.threeten.bp.LocalDateTime; -import org.threeten.bp.ZoneOffset; -import org.threeten.bp.format.DateTimeFormatter; -import org.threeten.bp.temporal.TemporalAccessor; -import org.threeten.bp.temporal.TemporalField; - import java.io.Serializable; import java.math.BigInteger; import java.util.List; import java.util.Objects; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; /** * A {@code Zone} represents a DNS zone hosted by the Google Cloud DNS service. A zone is a subtree @@ -241,8 +237,8 @@ ManagedZone toPb() { pb.setNameServers(this.nameServers); // do use real attribute value which may be null pb.setNameServerSet(this.getNameServerSet()); if (this.getCreationTimeMillis() != null) { - pb.setCreationTime(DATE_TIME_FORMATTER - .format(Instant.ofEpochMilli(this.getCreationTimeMillis()))); + pb.setCreationTime( + DATE_TIME_FORMATTER.format(Instant.ofEpochMilli(this.getCreationTimeMillis()))); } return pb; } diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java index 53986b8e21b1..d20c3ccd86e3 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/ProjectInfo.java @@ -25,14 +25,13 @@ import com.google.cloud.StringEnumValue; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import org.threeten.bp.Instant; -import org.threeten.bp.ZoneOffset; -import org.threeten.bp.format.DateTimeFormatter; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; /** * A Google Cloud Resource Manager project metadata object. A Project is a high-level Google Cloud @@ -394,8 +393,10 @@ com.google.api.services.cloudresourcemanager.model.Project toPb() { projectPb.setLifecycleState(state.toString()); } if (createTimeMillis != null) { - projectPb.setCreateTime(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC) - .format(Instant.ofEpochMilli(createTimeMillis))); + projectPb.setCreateTime( + DateTimeFormatter.ISO_DATE_TIME + .withZone(ZoneOffset.UTC) + .format(Instant.ofEpochMilli(createTimeMillis))); } if (parent != null) { projectPb.setParent(parent.toPb()); diff --git a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java index 35ce4f94ca7a..bbaa25d72ae8 100644 --- a/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java +++ b/google-cloud-clients/google-cloud-resourcemanager/src/main/java/com/google/cloud/resourcemanager/testing/LocalResourceManagerHelper.java @@ -21,7 +21,6 @@ import static java.net.HttpURLConnection.HTTP_OK; import com.google.api.client.json.JsonFactory; -import com.google.api.client.util.DateTime; import com.google.api.services.cloudresourcemanager.model.Binding; import com.google.api.services.cloudresourcemanager.model.Operation; import com.google.api.services.cloudresourcemanager.model.Policy; @@ -41,10 +40,6 @@ import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; -import org.threeten.bp.Instant; -import org.threeten.bp.ZoneOffset; -import org.threeten.bp.format.DateTimeFormatter; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -66,6 +61,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; +import org.threeten.bp.Instant; +import org.threeten.bp.ZoneOffset; +import org.threeten.bp.format.DateTimeFormatter; /** * Utility to create a local Resource Manager mock for testing. @@ -447,8 +445,10 @@ synchronized Response create(Project project) { } else { project.setLifecycleState("ACTIVE"); project.setProjectNumber(Math.abs(PROJECT_NUMBER_GENERATOR.nextLong() % Long.MAX_VALUE)); - project.setCreateTime(DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneOffset.UTC) - .format(Instant.ofEpochMilli(System.currentTimeMillis()))); + project.setCreateTime( + DateTimeFormatter.ISO_DATE_TIME + .withZone(ZoneOffset.UTC) + .format(Instant.ofEpochMilli(System.currentTimeMillis()))); if (projects.putIfAbsent(project.getProjectId(), project) != null) { return Error.ALREADY_EXISTS.response( "A project with the same project ID (" + project.getProjectId() + ") already exists."); From 5adee8459ad5aee3fa7b5565b1a8bb29c3d0fe8d Mon Sep 17 00:00:00 2001 From: Solomon Duskis Date: Fri, 18 Jan 2019 12:06:03 -0500 Subject: [PATCH 4/4] Fixing a bad merge --- google-cloud-clients/google-cloud-spanner/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml index 0ab320a671ba..cf4075bd5e4f 100644 --- a/google-cloud-clients/google-cloud-spanner/pom.xml +++ b/google-cloud-clients/google-cloud-spanner/pom.xml @@ -129,7 +129,6 @@ com.google.code.findbugs jsr305 -