Skip to content

Commit e851b44

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 2609 b: refs/heads/update-datastore c: a87cd14 h: refs/heads/master i: 2607: b8a2e90
1 parent 8d23828 commit e851b44

27 files changed

Lines changed: 105 additions & 93 deletions

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: 62a2d712a8406ec9526164c1745bc30cfb583475
8+
refs/heads/update-datastore: a87cd14359dafe99610a402d0690825048502c81
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
1010
refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
1111
refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseDatastoreBatchWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ protected DatastoreException newInvalidRequest(String msg, Object... params) {
199199
return DatastoreException.throwInvalidRequest(String.format(msg, params));
200200
}
201201

202-
protected DatastoreV1.Mutation.Builder toMutationPb() {
202+
DatastoreV1.Mutation.Builder toMutationPb() {
203203
DatastoreV1.Mutation.Builder mutationPb = DatastoreV1.Mutation.newBuilder();
204204
for (FullEntity<IncompleteKey> entity : toAddAutoId()) {
205205
mutationPb.addInsertAutoId(entity.toPb());

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private B self() {
9090
}
9191

9292
@SuppressWarnings("unchecked")
93-
protected B fill(DatastoreV1.Entity entityPb) {
93+
B fill(DatastoreV1.Entity entityPb) {
9494
Map<String, Value<?>> copiedProperties = Maps.newHashMap();
9595
for (DatastoreV1.Property property : entityPb.getPropertyList()) {
9696
copiedProperties.put(property.getName(), Value.fromPb(property.getValue()));
@@ -375,7 +375,7 @@ ImmutableSortedMap<String, Value<?>> properties() {
375375
}
376376

377377
@Override
378-
protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
378+
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
379379
Builder<?, ?> builder = emptyBuilder();
380380
builder.fill(DatastoreV1.Entity.parseFrom(bytesPb));
381381
return builder.build();
@@ -384,7 +384,7 @@ protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
384384
protected abstract Builder<?, ?> emptyBuilder();
385385

386386
@Override
387-
protected final DatastoreV1.Entity toPb() {
387+
final DatastoreV1.Entity toPb() {
388388
DatastoreV1.Entity.Builder entityPb = DatastoreV1.Entity.newBuilder();
389389
for (Map.Entry<String, Value<?>> entry : properties.entrySet()) {
390390
DatastoreV1.Property.Builder propertyPb = DatastoreV1.Property.newBuilder();

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseKey.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public boolean equals(Object obj) {
172172
}
173173

174174
@Override
175-
protected DatastoreV1.Key toPb() {
175+
DatastoreV1.Key toPb() {
176176
DatastoreV1.Key.Builder keyPb = DatastoreV1.Key.newBuilder();
177177
DatastoreV1.PartitionId.Builder partitionIdPb = DatastoreV1.PartitionId.newBuilder();
178178
if (projectId != null) {

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Blob.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ public static Blob copyFrom(InputStream input) throws IOException {
147147
}
148148

149149
@Override
150-
protected Value toPb() {
150+
Value toPb() {
151151
return DatastoreV1.Value.newBuilder().setBlobValue(byteString).build();
152152
}
153153

154154
@Override
155-
protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
155+
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
156156
return new Blob(DatastoreV1.Value.parseFrom(bytesPb).getBlobValue());
157157
}
158158
}

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BlobValue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public Builder newBuilder(Blob value) {
4040
}
4141

4242
@Override
43-
protected Blob getValue(DatastoreV1.Value from) {
43+
Blob getValue(DatastoreV1.Value from) {
4444
return new Blob(from.getBlobValue());
4545
}
4646

4747
@Override
48-
protected void setValue(BlobValue from, DatastoreV1.Value.Builder to) {
48+
void setValue(BlobValue from, DatastoreV1.Value.Builder to) {
4949
to.setBlobValue(from.get().byteString());
5050
}
5151
};

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BooleanValue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public Builder newBuilder(Boolean value) {
4040
}
4141

4242
@Override
43-
protected Boolean getValue(DatastoreV1.Value from) {
43+
Boolean getValue(DatastoreV1.Value from) {
4444
return from.getBooleanValue();
4545
}
4646

4747
@Override
48-
protected void setValue(BooleanValue from, DatastoreV1.Value.Builder to) {
48+
void setValue(BooleanValue from, DatastoreV1.Value.Builder to) {
4949
to.setBooleanValue(from.get());
5050
}
5151
};

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Cursor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ public static Cursor copyFrom(byte[] bytes) {
102102
}
103103

104104
@Override
105-
protected Value toPb() {
105+
Value toPb() {
106106
return DatastoreV1.Value.newBuilder().setBlobValue(byteString).build();
107107
}
108108

109109
@Override
110-
protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
110+
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
111111
return fromPb(DatastoreV1.Value.parseFrom(bytesPb));
112112
}
113113

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTime.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ public static DateTime copyFrom(Calendar calendar) {
9898
}
9999

100100
@Override
101-
protected Value toPb() {
101+
Value toPb() {
102102
return DatastoreV1.Value.newBuilder().setIntegerValue(timestampMicroseconds).build();
103103
}
104104

105105
@Override
106-
protected Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
106+
Object fromPb(byte[] bytesPb) throws InvalidProtocolBufferException {
107107
return new DateTime(DatastoreV1.Value.parseFrom(bytesPb).getIntegerValue());
108108
}
109109
}

‎branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DateTimeValue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ public Builder newBuilder(DateTime value) {
4040
}
4141

4242
@Override
43-
protected DateTime getValue(DatastoreV1.Value from) {
43+
DateTime getValue(DatastoreV1.Value from) {
4444
return new DateTime(from.getTimestampMicrosecondsValue());
4545
}
4646

4747
@Override
48-
protected void setValue(DateTimeValue from, DatastoreV1.Value.Builder to) {
48+
void setValue(DateTimeValue from, DatastoreV1.Value.Builder to) {
4949
to.setTimestampMicrosecondsValue(from.get().timestampMicroseconds());
5050
}
5151
};

0 commit comments

Comments
 (0)