Skip to content

Commit 36124c8

Browse files
mziccardmziccard
committed
---
yaml --- r: 1071 b: refs/heads/master c: 3c71bf2 h: refs/heads/master i: 1069: 58cf7d5 1067: 8d9ea9d 1063: da89698 1055: 28daa1e v: v3
1 parent a4be73f commit 36124c8

8 files changed

Lines changed: 101 additions & 307 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
2-
refs/heads/master: 99a4091760b66c84904d9476fd45c04676c0aa87
2+
refs/heads/master: 3c71bf2adf08dbd0f7983edd2fde45eef964f14c
33
refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
44
refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99

‎trunk/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/StructuredQuery.java‎

Lines changed: 24 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ static Filter fromPb(DatastoreV1.Filter filterPb) {
113113
}
114114
}
115115

116-
/**
117-
* A class representing a filter composed of a combination of other filters.
118-
*/
119116
public static final class CompositeFilter extends Filter {
120117

121118
private static final long serialVersionUID = 3610352685739360009L;
@@ -197,9 +194,6 @@ protected DatastoreV1.Filter toPb() {
197194
}
198195
}
199196

200-
/**
201-
* A class representing a filter based on a single property or ancestor.
202-
*/
203197
public static final class PropertyFilter extends Filter {
204198

205199
private static final long serialVersionUID = -4514695915258598597L;
@@ -266,67 +260,67 @@ public boolean equals(Object obj) {
266260
&& Objects.equals(value, other.value);
267261
}
268262

269-
public static PropertyFilter lt(String property, Value<?> value) {
263+
public static PropertyFilter le(String property, Value<?> value) {
270264
return new PropertyFilter(property, Operator.LESS_THAN, value);
271265
}
272266

273-
public static PropertyFilter lt(String property, String value) {
267+
public static PropertyFilter le(String property, String value) {
274268
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
275269
}
276270

277-
public static PropertyFilter lt(String property, long value) {
271+
public static PropertyFilter le(String property, long value) {
278272
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
279273
}
280274

281-
public static PropertyFilter lt(String property, double value) {
275+
public static PropertyFilter le(String property, double value) {
282276
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
283277
}
284278

285-
public static PropertyFilter lt(String property, boolean value) {
279+
public static PropertyFilter le(String property, boolean value) {
286280
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
287281
}
288282

289-
public static PropertyFilter lt(String property, DateTime value) {
283+
public static PropertyFilter le(String property, DateTime value) {
290284
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
291285
}
292286

293-
public static PropertyFilter lt(String property, Key value) {
287+
public static PropertyFilter le(String property, Key value) {
294288
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
295289
}
296290

297-
public static PropertyFilter lt(String property, Blob value) {
291+
public static PropertyFilter le(String property, Blob value) {
298292
return new PropertyFilter(property, Operator.LESS_THAN, of(value));
299293
}
300294

301-
public static PropertyFilter le(String property, Value<?> value) {
295+
public static PropertyFilter lte(String property, Value<?> value) {
302296
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, value);
303297
}
304298

305-
public static PropertyFilter le(String property, String value) {
299+
public static PropertyFilter lte(String property, String value) {
306300
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
307301
}
308302

309-
public static PropertyFilter le(String property, long value) {
303+
public static PropertyFilter lte(String property, long value) {
310304
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
311305
}
312306

313-
public static PropertyFilter le(String property, double value) {
307+
public static PropertyFilter lte(String property, double value) {
314308
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
315309
}
316310

317-
public static PropertyFilter le(String property, boolean value) {
311+
public static PropertyFilter lte(String property, boolean value) {
318312
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
319313
}
320314

321-
public static PropertyFilter le(String property, DateTime value) {
315+
public static PropertyFilter lte(String property, DateTime value) {
322316
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
323317
}
324318

325-
public static PropertyFilter le(String property, Key value) {
319+
public static PropertyFilter lte(String property, Key value) {
326320
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
327321
}
328322

329-
public static PropertyFilter le(String property, Blob value) {
323+
public static PropertyFilter lte(String property, Blob value) {
330324
return new PropertyFilter(property, Operator.LESS_THAN_OR_EQUAL, of(value));
331325
}
332326

@@ -362,35 +356,35 @@ public static PropertyFilter gt(String property, Blob value) {
362356
return new PropertyFilter(property, Operator.GREATER_THAN, of(value));
363357
}
364358

365-
public static PropertyFilter ge(String property, Value<?> value) {
359+
public static PropertyFilter gte(String property, Value<?> value) {
366360
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, value);
367361
}
368362

369-
public static PropertyFilter ge(String property, String value) {
363+
public static PropertyFilter gte(String property, String value) {
370364
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
371365
}
372366

373-
public static PropertyFilter ge(String property, long value) {
367+
public static PropertyFilter gte(String property, long value) {
374368
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
375369
}
376370

377-
public static PropertyFilter ge(String property, double value) {
371+
public static PropertyFilter gte(String property, double value) {
378372
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
379373
}
380374

381-
public static PropertyFilter ge(String property, boolean value) {
375+
public static PropertyFilter gte(String property, boolean value) {
382376
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
383377
}
384378

385-
public static PropertyFilter ge(String property, DateTime value) {
379+
public static PropertyFilter gte(String property, DateTime value) {
386380
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
387381
}
388382

389-
public static PropertyFilter ge(String property, Key value) {
383+
public static PropertyFilter gte(String property, Key value) {
390384
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
391385
}
392386

393-
public static PropertyFilter ge(String property, Blob value) {
387+
public static PropertyFilter gte(String property, Blob value) {
394388
return new PropertyFilter(property, Operator.GREATER_THAN_OR_EQUAL, of(value));
395389
}
396390

@@ -520,9 +514,6 @@ static OrderBy fromPb(DatastoreV1.PropertyOrder propertyOrderPb) {
520514
}
521515
}
522516

523-
/**
524-
* A class representing a projection based on a property.
525-
*/
526517
public static final class Projection implements Serializable {
527518

528519
private static final long serialVersionUID = 3083707957256279470L;
@@ -674,18 +665,12 @@ public B clearOrderBy() {
674665
return self();
675666
}
676667

677-
/**
678-
* Sets the query's order by clause (clearing any previously specified OrderBy settings).
679-
*/
680668
public B orderBy(OrderBy orderBy, OrderBy... others) {
681669
clearOrderBy();
682670
addOrderBy(orderBy, others);
683671
return self();
684672
}
685673

686-
/**
687-
* Adds settings to the existing order by clause.
688-
*/
689674
public B addOrderBy(OrderBy orderBy, OrderBy... others) {
690675
this.orderBy.add(orderBy);
691676
Collections.addAll(this.orderBy, others);
@@ -769,9 +754,6 @@ static final class Builder<V> extends BaseBuilder<V, Builder<V>> {
769754
}
770755
}
771756

772-
/**
773-
* A StructuredQuery builder for queries that return Entity results.
774-
*/
775757
public static final class EntityQueryBuilder extends BaseBuilder<Entity, EntityQueryBuilder> {
776758

777759
EntityQueryBuilder() {
@@ -784,9 +766,6 @@ public StructuredQuery<Entity> build() {
784766
}
785767
}
786768

787-
/**
788-
* A StructuredQuery builder for queries that return Key results.
789-
*/
790769
public static final class KeyQueryBuilder extends BaseBuilder<Key, KeyQueryBuilder> {
791770

792771
KeyQueryBuilder() {
@@ -808,9 +787,6 @@ public StructuredQuery<Key> build() {
808787
}
809788
}
810789

811-
/**
812-
* A StructuredQuery builder for projection queries.
813-
*/
814790
public static final class ProjectionEntityQueryBuilder
815791
extends BaseBuilder<ProjectionEntity, ProjectionEntityQueryBuilder> {
816792

@@ -828,17 +804,11 @@ public ProjectionEntityQueryBuilder clearProjection() {
828804
return super.clearProjection();
829805
}
830806

831-
/**
832-
* Sets the query's projection clause (clearing any previously specified Projection settings).
833-
*/
834807
@Override
835808
public ProjectionEntityQueryBuilder projection(Projection projection, Projection... others) {
836809
return super.projection(projection, others);
837810
}
838811

839-
/**
840-
* Adds one or more projections to the existing projection clause.
841-
*/
842812
@Override
843813
public ProjectionEntityQueryBuilder addProjection(Projection projection, Projection... others) {
844814
return super.addProjection(projection, others);
@@ -849,17 +819,11 @@ public ProjectionEntityQueryBuilder clearGroupBy() {
849819
return super.clearGroupBy();
850820
}
851821

852-
/**
853-
* Sets the query's group by clause (clearing any previously specified GroupBy settings).
854-
*/
855822
@Override
856823
public ProjectionEntityQueryBuilder groupBy(String property, String... others) {
857824
return super.groupBy(property, others);
858825
}
859826

860-
/**
861-
* Adds one or more properties to the existing group by clause.
862-
*/
863827
@Override
864828
public ProjectionEntityQueryBuilder addGroupBy(String property, String... others) {
865829
return super.addGroupBy(property, others);

‎trunk/gcloud-java-storage/src/main/java/com/google/gcloud/storage/Blob.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.google.common.collect.Lists;
2525
import com.google.gcloud.spi.StorageRpc;
2626
import com.google.gcloud.storage.Storage.BlobTargetOption;
27-
import com.google.gcloud.storage.Storage.BlobWriteOption;
2827
import com.google.gcloud.storage.Storage.CopyRequest;
2928
import com.google.gcloud.storage.Storage.SignUrlOption;
3029

@@ -270,14 +269,12 @@ public BlobReadChannel reader(BlobSourceOption... options) {
270269
}
271270

272271
/**
273-
* Returns a {@code BlobWriteChannel} object for writing to this blob. By default any md5 and
274-
* crc32c values in the current blob are ignored unless requested via the
275-
* {@code BlobWriteOption.md5Match} and {@code BlobWriteOption.crc32cMatch} options.
272+
* Returns a {@code BlobWriteChannel} object for writing to this blob.
276273
*
277274
* @param options target blob options
278275
* @throws StorageException upon failure
279276
*/
280-
public BlobWriteChannel writer(BlobWriteOption... options) {
277+
public BlobWriteChannel writer(BlobTargetOption... options) {
281278
return storage.writer(info, options);
282279
}
283280

0 commit comments

Comments
 (0)