diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java index aec0d41c0202..b4aa57efec7a 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseEntity.java @@ -28,10 +28,11 @@ import static com.google.cloud.datastore.NullValue.of; import static com.google.cloud.datastore.StringValue.of; +import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Maps; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.Serializable; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -49,12 +50,10 @@ * @see Google Cloud Datastore * Entities, Properties, and Keys */ -public abstract class BaseEntity - extends Serializable { +public abstract class BaseEntity implements Serializable { - private static final long serialVersionUID = 8175618724683792766L; - - private final transient ImmutableSortedMap> properties; + private static final long serialVersionUID = -9070588108769487081L; + private final ImmutableSortedMap> properties; private final K key; public abstract static class Builder> { @@ -459,6 +458,14 @@ public B setNull(String name) { this.properties = from.properties; } + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("key", key) + .add("properties", properties) + .toString(); + } + @Override public int hashCode() { return Objects.hash(key, properties); @@ -643,16 +650,6 @@ ImmutableSortedMap> properties() { return properties; } - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - Builder builder = emptyBuilder(); - builder.fill(com.google.datastore.v1.Entity.parseFrom(bytesPb)); - return builder.build(); - } - - protected abstract Builder emptyBuilder(); - - @Override final com.google.datastore.v1.Entity toPb() { com.google.datastore.v1.Entity.Builder entityPb = com.google.datastore.v1.Entity.newBuilder(); Map propertiesPb = entityPb.getMutableProperties(); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java index c04dc6500581..9623c46b7c63 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java @@ -20,9 +20,11 @@ import static com.google.cloud.datastore.Validator.validateKind; import static com.google.cloud.datastore.Validator.validateNamespace; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -30,13 +32,13 @@ /** * Base class for keys. */ -public abstract class BaseKey extends Serializable { +public abstract class BaseKey implements Serializable { - private static final long serialVersionUID = -4671243265877410635L; + private static final long serialVersionUID = -5897863400209818325L; - private final transient String projectId; - private final transient String namespace; - private final transient ImmutableList path; + private final String projectId; + private final String namespace; + private final ImmutableList path; /** * Base class for key builders. @@ -158,6 +160,15 @@ public String kind() { abstract BaseKey parent(); + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("projectId", projectId) + .add("namespace", namespace) + .add("path", path) + .toString(); + } + @Override public int hashCode() { return Objects.hash(projectId(), namespace(), path()); @@ -177,7 +188,6 @@ public boolean equals(Object obj) { && Objects.equals(path(), other.path()); } - @Override com.google.datastore.v1.Key toPb() { com.google.datastore.v1.Key.Builder keyPb = com.google.datastore.v1.Key.newBuilder(); com.google.datastore.v1.PartitionId.Builder partitionIdPb = diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java index 7d4ea1bb5d0c..22fac0a5d09f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Blob.java @@ -21,12 +21,12 @@ import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.protobuf.ByteString; -import com.google.protobuf.InvalidProtocolBufferException; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.nio.ByteBuffer; /** @@ -36,11 +36,11 @@ * @see * Google Cloud Datastore Entities, Properties, and Keys */ -public final class Blob extends Serializable { +public final class Blob implements Serializable { - private static final long serialVersionUID = 3835421019618247721L; + private static final long serialVersionUID = 7311366042557240313L; - private final transient ByteString byteString; + private final ByteString byteString; Blob(ByteString byteString) { this.byteString = checkNotNull(byteString); @@ -144,13 +144,7 @@ public static Blob copyFrom(InputStream input) throws IOException { return copyFrom(bytes.toByteArray()); } - @Override com.google.datastore.v1.Value toPb() { return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build(); } - - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return new Blob(com.google.datastore.v1.Value.parseFrom(bytesPb).getBlobValue()); - } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java index d1e9fbbf0693..5f2243e36447 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BlobValue.java @@ -25,7 +25,7 @@ public final class BlobValue extends Value { static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = -823515687083612387L; + private static final long serialVersionUID = -739627441374592171L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java index a2b70f0bb974..9fb930e6d5a5 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/BooleanValue.java @@ -20,12 +20,12 @@ public final class BooleanValue extends Value { - private static final long serialVersionUID = -542649497897250340L; + private static final long serialVersionUID = -6692551696100439451L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = 7080467411349092522L; + private static final long serialVersionUID = 5178009712526977429L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java index 8a68b213965f..f0fdf0e07212 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Cursor.java @@ -22,17 +22,18 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.io.BaseEncoding; import com.google.protobuf.ByteString; -import com.google.protobuf.InvalidProtocolBufferException; + +import java.io.Serializable; /** * A Google Cloud Datastore cursor. * The cursor can be used to as a starting point or an ending point for a {@link Query} */ -public final class Cursor extends Serializable { +public final class Cursor implements Serializable { - private static final long serialVersionUID = -1423744878777486541L; + private static final long serialVersionUID = 4688656124180503551L; - private final transient ByteString byteString; + private final ByteString byteString; Cursor(ByteString byteString) { this.byteString = byteString; @@ -84,17 +85,7 @@ public static Cursor copyFrom(byte[] bytes) { return new Cursor(ByteString.copyFrom(checkNotNull(bytes))); } - @Override com.google.datastore.v1.Value toPb() { return com.google.datastore.v1.Value.newBuilder().setBlobValue(byteString).build(); } - - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1.Value.parseFrom(bytesPb)); - } - - static Cursor fromPb(com.google.datastore.v1.Value valuePb) { - return new Cursor(valuePb.getBlobValue()); - } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java index 1c067a719585..32559ebb58d0 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreBatchWriter.java @@ -60,7 +60,7 @@ interface DatastoreBatchWriter extends DatastoreWriter { /** * {@inheritDoc} * This operation will also remove from this batch any prior writes for entities with the same - * keys + * keys. * * @throws DatastoreException if not active */ diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTime.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTime.java index fd72edc9806f..dee2558275bb 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTime.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTime.java @@ -18,10 +18,9 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.protobuf.InvalidProtocolBufferException; - import org.joda.time.format.ISODateTimeFormat; +import java.io.Serializable; import java.util.Calendar; import java.util.Date; @@ -32,12 +31,11 @@ * @see Google Cloud Datastore * Entities, Properties, and Keys */ -public final class DateTime extends Serializable - implements Comparable { +public final class DateTime implements Comparable, Serializable { - private static final long serialVersionUID = 7343324797621228378L; + private static final long serialVersionUID = 5152143600571559844L; - private final transient long timestampMicroseconds; + private final long timestampMicroseconds; DateTime(long timestampMicroseconds) { this.timestampMicroseconds = timestampMicroseconds; @@ -95,17 +93,10 @@ public static DateTime copyFrom(Calendar calendar) { return copyFrom(calendar.getTime()); } - @Override com.google.protobuf.Timestamp toPb() { return microsecondsToTimestampPb(timestampMicroseconds); } - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return new DateTime(timestampPbToMicroseconds( - com.google.protobuf.Timestamp.parseFrom(bytesPb))); - } - static long timestampPbToMicroseconds(com.google.protobuf.Timestamp timestampPb) { return timestampPb.getSeconds() * 1000000 + timestampPb.getNanos() / 1000; } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java index 3efeccf7e904..534328f6c0d5 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DateTimeValue.java @@ -20,12 +20,12 @@ public final class DateTimeValue extends Value { - private static final long serialVersionUID = -5096238337676649540L; + private static final long serialVersionUID = -8502433575902990648L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = -5695812592049332840L; + private static final long serialVersionUID = -5789520029958113745L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java index 8217cec55bcd..d2afa2e2ccc5 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DoubleValue.java @@ -20,12 +20,12 @@ public final class DoubleValue extends Value { - private static final long serialVersionUID = -5096238337676649540L; + private static final long serialVersionUID = -6282769624277370453L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = 3935522813529400538L; + private static final long serialVersionUID = -48735616199736169L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java index 0a8db7618a94..25e71541115c 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Entity.java @@ -26,7 +26,7 @@ */ public final class Entity extends FullEntity { - private static final long serialVersionUID = 432961565733066915L; + private static final long serialVersionUID = 2312315289215899118L; public static final class Builder extends BaseEntity.Builder { @@ -68,11 +68,6 @@ public Entity build() { Preconditions.checkArgument(from.key() != null); } - @Override - protected BaseEntity.Builder emptyBuilder() { - return new Builder(); - } - static Entity convert(FullEntity from) { if (from instanceof Entity) { return (Entity) from; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java index f2e0f9e035da..884e0b6514f0 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityQuery.java @@ -25,7 +25,7 @@ */ public final class EntityQuery extends StructuredQuery { - private static final long serialVersionUID = 2990565454831019471L; + private static final long serialVersionUID = -4748310327736758820L; /** * A {@code EntityQuery} builder for queries that return {@link Entity} results. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java index 44ac84f6358a..be7daace342e 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/EntityValue.java @@ -20,12 +20,12 @@ public class EntityValue extends Value> { - private static final long serialVersionUID = -5461475706792576395L; + private static final long serialVersionUID = 2231420223179039760L; static final BaseMarshaller, EntityValue, Builder> MARSHALLER = new BaseMarshaller, EntityValue, Builder>() { - private static final long serialVersionUID = 2355075086076070931L; + private static final long serialVersionUID = 7349141367266671632L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java index 31cb7b9518e1..a2871876a775 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/FullEntity.java @@ -22,7 +22,7 @@ */ public class FullEntity extends BaseEntity { - private static final long serialVersionUID = 432961565733066915L; + private static final long serialVersionUID = -2075539363782670624L; public static class Builder extends BaseEntity.Builder> { @@ -51,11 +51,6 @@ public FullEntity build() { super(from); } - @Override - protected BaseEntity.Builder emptyBuilder() { - return new Builder(); - } - public static Builder builder() { return new Builder<>(); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java index 8724362dd89e..6409356cf33e 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java @@ -26,8 +26,8 @@ import com.google.common.primitives.Booleans; import com.google.common.primitives.Doubles; import com.google.common.primitives.Longs; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; @@ -70,19 +70,19 @@ */ public final class GqlQuery extends Query { - private static final long serialVersionUID = 5988280590929540569L; + private static final long serialVersionUID = -5514894742849230793L; - private final transient String queryString; - private final transient boolean allowLiteral; - private final transient ImmutableMap namedBindings; - private final transient ImmutableList positionalBindings; + private final String queryString; + private final boolean allowLiteral; + private final ImmutableMap namedBindings; + private final ImmutableList positionalBindings; - static final class Binding extends Serializable { + static final class Binding implements Serializable { - private static final long serialVersionUID = 1976895435257636275L; + private static final long serialVersionUID = 2344746877591371548L; - private final transient Cursor cursor; - private final transient Value value; + private final Cursor cursor; + private final Value value; Binding(Cursor cursor) { this.cursor = checkNotNull(cursor); @@ -98,6 +98,11 @@ Object cursorOrValue() { return MoreObjects.firstNonNull(cursor, value); } + @Override + public String toString() { + return MoreObjects.toStringHelper(this).add("cursor", cursor).add("value", value).toString(); + } + @Override public int hashCode() { return Objects.hash(cursor, value); @@ -115,7 +120,6 @@ public boolean equals(Object obj) { return Objects.equals(cursor, other.cursor) && Objects.equals(value, other.value); } - @Override com.google.datastore.v1.GqlQueryParameter toPb() { com.google.datastore.v1.GqlQueryParameter.Builder argPb = com.google.datastore.v1.GqlQueryParameter.newBuilder(); @@ -128,11 +132,6 @@ com.google.datastore.v1.GqlQueryParameter toPb() { return argPb.build(); } - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1.GqlQueryParameter.parseFrom(bytesPb)); - } - static Binding fromPb(com.google.datastore.v1.GqlQueryParameter argPb) { switch (argPb.getParameterTypeCase()) { case CURSOR: @@ -335,6 +334,16 @@ public List numberArgs() { return builder.build(); } + @Override + public String toString() { + return super.toStringHelper() + .add("queryString", queryString) + .add("allowLiteral", allowLiteral) + .add("namedBindings", namedBindings) + .add("positionalBindings", positionalBindings) + .toString(); + } + @Override public int hashCode() { return Objects.hash(namespace(), queryString, allowLiteral, namedBindings, positionalBindings); @@ -356,7 +365,6 @@ public boolean equals(Object obj) { && Objects.equals(positionalBindings, other.positionalBindings); } - @Override com.google.datastore.v1.GqlQuery toPb() { com.google.datastore.v1.GqlQuery.Builder queryPb = com.google.datastore.v1.GqlQuery.newBuilder(); @@ -383,29 +391,4 @@ Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb) { return StructuredQuery.fromPb(type(), namespace(), responsePb.getQuery()) .nextQuery(responsePb); } - - @Override - Object fromPb(ResultType resultType, String namespace, byte[] bytesPb) - throws InvalidProtocolBufferException { - return fromPb(resultType, namespace, com.google.datastore.v1.GqlQuery.parseFrom(bytesPb)); - } - - private static GqlQuery fromPb( - ResultType resultType, String ns, com.google.datastore.v1.GqlQuery queryPb) { - Builder builder = new Builder<>(resultType, queryPb.getQueryString()); - builder.namespace(ns); - builder.allowLiteral = queryPb.getAllowLiterals(); - for (Map.Entry nameArg - : queryPb.getNamedBindings().entrySet()) { - Binding currBinding = Binding.fromPb(nameArg.getValue()); - builder.namedBindings.put(nameArg.getKey(), currBinding); - } - for (com.google.datastore.v1.GqlQueryParameter numberArg - : queryPb.getPositionalBindingsList()) { - Binding currBinding = Binding.fromPb(numberArg); - builder.positionalBindings.add(currBinding); - } - return builder.build(); - } - } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java index 46c3b91b4d09..53039f77aea5 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/IncompleteKey.java @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.protobuf.InvalidProtocolBufferException; import java.util.List; @@ -28,7 +27,7 @@ */ public class IncompleteKey extends BaseKey { - private static final long serialVersionUID = -75301206578793347L; + private static final long serialVersionUID = 4947014765344279019L; public static class Builder extends BaseKey.Builder { @@ -52,11 +51,6 @@ public IncompleteKey build() { super(projectId, namespace, path); } - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1.Key.parseFrom(bytesPb)); - } - static IncompleteKey fromPb(com.google.datastore.v1.Key keyPb) { String projectId = ""; String namespace = ""; diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java index c71a5a7909f3..9f7e5d602070 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Key.java @@ -20,7 +20,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.TextFormat; import java.io.UnsupportedEncodingException; @@ -37,7 +36,7 @@ */ public final class Key extends IncompleteKey { - private static final long serialVersionUID = 3160994559785491356L; + private static final long serialVersionUID = 2563249643000943477L; public static final class Builder extends BaseKey.Builder { @@ -162,11 +161,6 @@ public static Key fromUrlSafe(String urlSafe) { } } - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1.Key.parseFrom(bytesPb)); - } - static Key fromPb(com.google.datastore.v1.Key keyPb) { IncompleteKey key = IncompleteKey.fromPb(keyPb); Preconditions.checkState(key instanceof Key, "Key is not complete"); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java index 9616141b3fd6..ec21397cc7ae 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyQuery.java @@ -25,7 +25,7 @@ */ public final class KeyQuery extends StructuredQuery { - private static final long serialVersionUID = -746768461459070045L; + private static final long serialVersionUID = 1187064062245269457L; /** * A {@code KeyQuery} builder for queries that return {@link Key} results. diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java index 111592d956bc..aedf9e914b45 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/KeyValue.java @@ -20,12 +20,12 @@ public final class KeyValue extends Value { - private static final long serialVersionUID = -1318353707326704821L; + private static final long serialVersionUID = 571775607775319610L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = 5449133205064700403L; + private static final long serialVersionUID = -4653913699919198594L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java index 72f9e9f4f04f..e2407225032b 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLng.java @@ -18,8 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument; -import com.google.protobuf.InvalidProtocolBufferException; - +import java.io.Serializable; import java.util.Objects; /** @@ -29,12 +28,12 @@ * @see Google Cloud Datastore * Entities, Properties, and Keys */ -public final class LatLng extends Serializable { +public final class LatLng implements Serializable { - private static final long serialVersionUID = 9077060962655752073L; + private static final long serialVersionUID = -3739859034159591779L; - private final transient double latitude; - private final transient double longitude; + private final double latitude; + private final double longitude; LatLng(double latitude, double longitude) { checkArgument( @@ -74,17 +73,10 @@ public static LatLng of(double latitude, double longitude) { return new LatLng(latitude, longitude); } - @Override protected com.google.type.LatLng toPb() { return com.google.type.LatLng.newBuilder() .setLatitude(latitude) .setLongitude(longitude) .build(); } - - @Override - protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - com.google.type.LatLng parsedLatLng = com.google.type.LatLng.parseFrom(bytesPb); - return new LatLng(parsedLatLng.getLatitude(), parsedLatLng.getLongitude()); - } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java index 96f369f7c1ba..1a4eac8b6b1d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LatLngValue.java @@ -20,12 +20,12 @@ public final class LatLngValue extends Value { - private static final long serialVersionUID = -5810614280642405898L; + private static final long serialVersionUID = 565308388087634597L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = -3550567536035178649L; + private static final long serialVersionUID = -5226207069346124222L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java index 7ca1991bc490..92191f980c3f 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ListValue.java @@ -29,12 +29,12 @@ */ public final class ListValue extends Value>> { - private static final long serialVersionUID = -5461475706792576395L; + private static final long serialVersionUID = -5121887228607148857L; static final BaseMarshaller>, ListValue, Builder> MARSHALLER = new BaseMarshaller>, ListValue, Builder>() { - private static final long serialVersionUID = -3193794036327640106L; + private static final long serialVersionUID = 7720473855548179942L; @Override public int getProtoFieldId() { @@ -57,7 +57,7 @@ protected List> getValue(com.google.datastore.v1.Value from) { @Override protected void setValue(ListValue from, com.google.datastore.v1.Value.Builder to) { - List propertiesPb = new ArrayList(); + List propertiesPb = new ArrayList<>(); for (Value property : from.get()) { propertiesPb.add(property.toPb()); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java index e05a3307b7e8..1a1011f5f1b1 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/LongValue.java @@ -20,12 +20,12 @@ public final class LongValue extends Value { - private static final long serialVersionUID = -8552854340400546861L; + private static final long serialVersionUID = -3433015349912039278L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = 2137414214660959845L; + private static final long serialVersionUID = -8359920606872800391L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java index b80f34fbfb9a..b94415b74736 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/NullValue.java @@ -21,12 +21,12 @@ public final class NullValue extends Value { - private static final long serialVersionUID = 8497300779013002270L; + private static final long serialVersionUID = 2089084567599008130L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = 2785573597627128832L; + private static final long serialVersionUID = 6997769137212338027L; @Override public Builder newBuilder(Void value) { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java index 03ee54286b37..da564d6e868e 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/PathElement.java @@ -19,21 +19,22 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.common.base.Strings; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.Serializable; import java.util.Objects; /** * Represents a single element in a key's path. */ -public final class PathElement extends Serializable { +public final class PathElement implements Serializable { - private static final long serialVersionUID = -7968078857690784595L; + private static final long serialVersionUID = -777300414390493910L; - private final transient String kind; - private final transient Long id; - private final transient String name; + private final String kind; + private final Long id; + private final String name; private PathElement(String kind, String name, Long id) { this.kind = checkNotNull(kind, "kind must not be null"); @@ -65,6 +66,15 @@ public Object nameOrId() { return id == null ? name : id; } + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("kind", kind) + .add("id", id) + .add("name", name) + .toString(); + } + @Override public int hashCode() { return Objects.hash(kind, id, name); @@ -84,7 +94,6 @@ public boolean equals(Object obj) { && Objects.equals(name, other.name); } - @Override com.google.datastore.v1.Key.PathElement toPb() { com.google.datastore.v1.Key.PathElement.Builder pathElementPb = com.google.datastore.v1.Key.PathElement.newBuilder(); @@ -97,11 +106,6 @@ com.google.datastore.v1.Key.PathElement toPb() { return pathElementPb.build(); } - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1.Key.PathElement.parseFrom(bytesPb)); - } - static PathElement fromPb(com.google.datastore.v1.Key.PathElement pathElementPb) { String kind = pathElementPb.getKind(); switch (pathElementPb.getIdTypeCase()) { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java index 07dfc51e54a5..2468fc837c8a 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntity.java @@ -30,7 +30,7 @@ */ public final class ProjectionEntity extends BaseEntity { - private static final long serialVersionUID = 432961565733066915L; + private static final long serialVersionUID = -3399517537444851544L; public static final class Builder extends BaseEntity.Builder { @@ -75,11 +75,6 @@ static ProjectionEntity fromPb(com.google.datastore.v1.Entity entityPb) { return new Builder().fill(entityPb).build(); } - @Override - protected Builder emptyBuilder() { - return new Builder(); - } - public static Builder builder(ProjectionEntity copyFrom) { return new Builder(copyFrom); } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java index 5ccfed549941..e28fcf3a0b4b 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ProjectionEntityQuery.java @@ -25,7 +25,7 @@ */ public final class ProjectionEntityQuery extends StructuredQuery { - private static final long serialVersionUID = 5488451194542425391L; + private static final long serialVersionUID = 6217728277947673577L; /** * A {@code ProjectionEntityQuery} builder for queries that return {@link ProjectionEntity} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java index eb33c02b107b..a2396bad0e78 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Query.java @@ -21,26 +21,24 @@ import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Maps; -import com.google.protobuf.GeneratedMessage; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.Serializable; import java.util.Map; - /** * A Google Cloud Datastore query. * For usage examples see {@link GqlQuery} and {@link StructuredQuery}. * - * Note that queries require proper indexing. See + *

Note that queries require proper indexing. See * * Cloud Datastore Index Configuration for help configuring indexes. * * @param the type of the values returned by this query. * @see Datastore Queries */ -public abstract class Query extends Serializable { +public abstract class Query implements Serializable { - private static final long serialVersionUID = -2748141759901313101L; + private static final long serialVersionUID = 7967659059395653941L; private final ResultType resultType; private final String namespace; @@ -51,7 +49,7 @@ public abstract class Query extends Serializable { * PROJECTION_ENTITY: A projection entity, represented by {@link ProjectionEntity}. * KEY: An entity's {@link Key}. */ - public abstract static class ResultType implements java.io.Serializable { + public abstract static class ResultType implements Serializable { private static final long serialVersionUID = 2104157695425806623L; private static final Map> @@ -173,23 +171,10 @@ public String namespace() { return namespace; } - @Override - public String toString() { - ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); - toStringHelper.add("type", resultType); - toStringHelper.add("namespace", namespace); - toStringHelper.add("queryPb", super.toString()); - return toStringHelper.toString(); - } - - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(resultType, namespace, bytesPb); + ToStringHelper toStringHelper() { + return MoreObjects.toStringHelper(this).add("type", resultType).add("namespace", namespace); } - abstract Object fromPb(ResultType resultType, String namespace, byte[] bytesPb) - throws InvalidProtocolBufferException; - abstract void populatePb(com.google.datastore.v1.RunQueryRequest.Builder requestPb); abstract Query nextQuery(com.google.datastore.v1.RunQueryResponse responsePb); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java index f02f32eb3e73..35510df76d10 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/RawValue.java @@ -18,12 +18,12 @@ public final class RawValue extends Value { - private static final long serialVersionUID = -3359604598651897941L; + private static final long serialVersionUID = 6615860024753061102L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = 5320642719486106244L; + private static final long serialVersionUID = -5724906360924425548L; @Override public Builder newBuilder(com.google.datastore.v1.Value value) { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Serializable.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Serializable.java deleted file mode 100644 index 2e305935f32e..000000000000 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Serializable.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2015 Google Inc. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.datastore; - -import com.google.protobuf.GeneratedMessage; -import com.google.protobuf.InvalidProtocolBufferException; - -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamException; -import java.io.StreamCorruptedException; - -abstract class Serializable implements java.io.Serializable { - - private static final long serialVersionUID = -5565522710061949199L; - - private transient byte[] bytesPb; // only for deserialization - - @Override - public String toString() { - return toPb().toString(); - } - - private void writeObject(ObjectOutputStream output) throws IOException { - output.defaultWriteObject(); - output.writeObject(toPb().toByteArray()); - } - - private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException { - input.defaultReadObject(); - bytesPb = (byte[]) input.readObject(); - } - - Object readResolve() throws ObjectStreamException { - try { - return fromPb(bytesPb); - } catch (InvalidProtocolBufferException ex) { - StreamCorruptedException sce = new StreamCorruptedException("Failed to create object"); - sce.initCause(ex); - throw sce; - } finally { - bytesPb = null; - } - } - - abstract M toPb(); - - abstract Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException; -} diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java index e9d43d11a662..bb90aada37f3 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StringValue.java @@ -20,12 +20,12 @@ public final class StringValue extends Value { - private static final long serialVersionUID = -3105699707394545523L; + private static final long serialVersionUID = -8709280401468276732L; static final BaseMarshaller MARSHALLER = new BaseMarshaller() { - private static final long serialVersionUID = -359610204134164436L; + private static final long serialVersionUID = -635109599283869091L; @Override public int getProtoFieldId() { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java index eb9629a8e6fb..6d3c6fd19e83 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/StructuredQuery.java @@ -29,7 +29,6 @@ import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.protobuf.InvalidProtocolBufferException; import java.io.Serializable; import java.util.Arrays; @@ -85,15 +84,15 @@ public abstract class StructuredQuery extends Query { private static final long serialVersionUID = 546838955624019594L; static final String KEY_PROPERTY_NAME = "__key__"; - private final transient String kind; + private final String kind; private final ImmutableList projection; - private final transient Filter filter; + private final Filter filter; private final ImmutableList distinctOn; - private final transient ImmutableList orderBy; - private final transient Cursor startCursor; - private final transient Cursor endCursor; - private final transient int offset; - private final transient Integer limit; + private final ImmutableList orderBy; + private final Cursor startCursor; + private final Cursor endCursor; + private final int offset; + private final Integer limit; public abstract static class Filter implements Serializable { @@ -751,10 +750,25 @@ B mergeFrom(com.google.datastore.v1.Query queryPb) { limit = builder.limit; } + @Override + public String toString() { + return toStringHelper() + .add("kind", kind) + .add("startCursor", startCursor) + .add("endCursor", endCursor) + .add("offset", offset) + .add("limit", limit) + .add("filter", filter) + .add("orderBy", orderBy) + .add("projection", projection) + .add("distinctOn", distinctOn) + .toString(); + } + @Override public int hashCode() { return Objects.hash(namespace(), kind, startCursor, endCursor, offset, limit, filter, orderBy, - distinctOn()); + projection, distinctOn); } @Override @@ -841,7 +855,6 @@ StructuredQuery nextQuery(com.google.datastore.v1.RunQueryResponse responsePb return builder.build(); } - @Override com.google.datastore.v1.Query toPb() { com.google.datastore.v1.Query.Builder queryPb = com.google.datastore.v1.Query.newBuilder(); if (kind != null) { @@ -857,7 +870,7 @@ com.google.datastore.v1.Query toPb() { queryPb.setOffset(offset); } if (limit != null) { - queryPb.setLimit(com.google.protobuf.Int32Value.newBuilder().setValue(limit.intValue())); + queryPb.setLimit(com.google.protobuf.Int32Value.newBuilder().setValue(limit)); } if (filter != null) { queryPb.setFilter(filter.toPb()); @@ -879,12 +892,6 @@ com.google.datastore.v1.Query toPb() { return queryPb.build(); } - @Override - Object fromPb(ResultType resultType, String namespace, byte[] bytesPb) - throws InvalidProtocolBufferException { - return fromPb(resultType, namespace, com.google.datastore.v1.Query.parseFrom(bytesPb)); - } - @SuppressWarnings("unchecked") static StructuredQuery fromPb(ResultType resultType, String namespace, com.google.datastore.v1.Query queryPb) { diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java index 7cd96bc29c33..00f2c2fa64ce 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Value.java @@ -18,9 +18,10 @@ import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.MoreObjects; import com.google.datastore.v1.Value.ValueTypeCase; -import com.google.protobuf.InvalidProtocolBufferException; +import java.io.Serializable; import java.util.Objects; /** @@ -31,14 +32,14 @@ * * @param the type of the content for this value */ -public abstract class Value extends Serializable { +public abstract class Value implements Serializable { - private static final long serialVersionUID = -1899638277588872742L; + private static final long serialVersionUID = 8532411152601335280L; - private final transient ValueType valueType; - private final transient boolean excludeFromIndexes; - private final transient int meaning; - private final transient V value; + private final ValueType valueType; + private final boolean excludeFromIndexes; + private final int meaning; + private final V value; interface BuilderFactory, B extends ValueBuilder> extends java.io.Serializable { @@ -48,7 +49,7 @@ interface BuilderFactory, B extends ValueBuilder> abstract static class BaseMarshaller, B extends ValueBuilder> implements ValueMarshaller, BuilderFactory { - private static final long serialVersionUID = 2880767488942992985L; + private static final long serialVersionUID = -5224067974180563797L; @SuppressWarnings("deprecation") @Override @@ -170,6 +171,16 @@ public final V get() { public abstract ValueBuilder toBuilder(); + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("valueType", valueType) + .add("excludeFromIndexes", excludeFromIndexes) + .add("meaning", meaning) + .add("value", value) + .toString(); + } + @Override public int hashCode() { return Objects.hash(valueType, excludeFromIndexes, meaning, value); @@ -191,7 +202,6 @@ public boolean equals(Object obj) { && Objects.equals(value, other.value); } - @Override @SuppressWarnings("unchecked") com.google.datastore.v1.Value toPb() { return type().getMarshaller().toProto(this); @@ -203,9 +213,4 @@ static Value fromPb(com.google.datastore.v1.Value proto) { return valueType == null ? RawValue.MARSHALLER.fromProto(proto).build() : valueType.getMarshaller().fromProto(proto).build(); } - - @Override - Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return fromPb(com.google.datastore.v1.Value.parseFrom(bytesPb)); - } } diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java index c0ce439c6bef..596eb744b3c8 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueMarshaller.java @@ -16,11 +16,13 @@ package com.google.cloud.datastore; +import java.io.Serializable; + /** * A common interface for Value marshallers. */ interface ValueMarshaller, B extends ValueBuilder> - extends java.io.Serializable { + extends Serializable { B fromProto(com.google.datastore.v1.Value proto); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java index 2b023654742a..9fb90f806c1d 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java @@ -81,7 +81,7 @@ public enum ValueType { RAW_VALUE(RawValue.MARSHALLER), /** - * Represents a {@link LatLng} value + * Represents a {@link LatLng} value. */ LAT_LNG(LatLngValue.MARSHALLER); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java index cbb2436c82e6..39d6f41e953b 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/DefaultDatastoreRpc.java @@ -53,15 +53,15 @@ public DefaultDatastoreRpc(DatastoreOptions options) { } else if (!removeScheme(com.google.datastore.v1.client.DatastoreFactory.DEFAULT_HOST) .equals(removeScheme(normalizedHost)) && !normalizedHost.isEmpty()) { - String fullURL = normalizedHost; - if (fullURL.charAt(fullURL.length() - 1) != '/') { - fullURL = fullURL + '/'; + String fullUrl = normalizedHost; + if (fullUrl.charAt(fullUrl.length() - 1) != '/') { + fullUrl = fullUrl + '/'; } - fullURL = fullURL + fullUrl = fullUrl + com.google.datastore.v1.client.DatastoreFactory.VERSION + "/projects/" + options.projectId(); - clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullURL); + clientBuilder = clientBuilder.projectId(null).projectEndpoint(fullUrl); } client = com.google.datastore.v1.client.DatastoreFactory.get() .create(clientBuilder.build()); diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java index 3c54357de9d7..106fab01f005 100644 --- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java +++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java @@ -623,7 +623,7 @@ public static LocalDatastoreHelper create() { * * @throws InterruptedException if emulator-related tasks are interrupted * @throws IOException if there are socket exceptions or issues creating/deleting the temporary - * data folder + * data folder */ public void start() throws IOException, InterruptedException { // send a quick request in case we have a hanging process from a previous run diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java index f5100b14dac5..08884a997bc0 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseEntityTest.java @@ -48,13 +48,7 @@ private class Builder extends BaseEntity.Builder { @Override public BaseEntity build() { - return new BaseEntity(this) { - - @Override - protected BaseEntityTest.Builder emptyBuilder() { - return new BaseEntityTest.Builder(); - } - }; + return new BaseEntity(this) {}; } } diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java index abbfbd3a2f16..9d46c2eebb94 100644 --- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java +++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/BaseKeyTest.java @@ -45,10 +45,6 @@ protected BaseKey build() { path.addAll(ancestors); path.add(PathElement.of(kind)); return new BaseKey(projectId, namespace, path.build()) { - @Override - protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException { - return null; - } @Override protected BaseKey parent() {