Skip to content

Commit a19ce22

Browse files
aozarovaozarov
committed
---
yaml --- r: 5845 b: refs/heads/tswast-patch-1 c: ff2827e h: refs/heads/master i: 5843: 4c7accd
1 parent 7e4020e commit a19ce22

20 files changed

Lines changed: 89 additions & 57 deletions

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 6019e60c7fe225b32a95d91848afbcc6dc22a09c
60+
refs/heads/tswast-patch-1: ff2827e0d5ba996788e0aa67d8f83f4ac6eac477
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/target/
22
.settings
3+
.idea

‎branches/tswast-patch-1/git-demo.iml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
10+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
11+
<excludeFolder url="file://$MODULE_DIR$/target" />
12+
</content>
13+
<orderEntry type="inheritedJdk" />
14+
<orderEntry type="sourceFolder" forTests="false" />
15+
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client:1.19.0" level="project" />
16+
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
17+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
18+
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
19+
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
20+
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.3" level="project" />
21+
<orderEntry type="library" name="Maven: com.google.oauth-client:google-oauth-client:1.19.0" level="project" />
22+
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
23+
<orderEntry type="library" name="Maven: com.google.apis:google-api-services-datastore-protobuf:v1beta2-rev1-2.1.0" level="project" />
24+
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
25+
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client-protobuf:1.15.0-rc" level="project" />
26+
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client-jackson:1.15.0-rc" level="project" />
27+
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.11" level="project" />
28+
<orderEntry type="library" name="Maven: com.google.api-client:google-api-client:1.15.0-rc" level="project" />
29+
<orderEntry type="library" name="Maven: com.google.api-client:google-api-client-appengine:1.19.0" level="project" />
30+
<orderEntry type="library" name="Maven: com.google.oauth-client:google-oauth-client-appengine:1.19.0" level="project" />
31+
<orderEntry type="library" name="Maven: com.google.oauth-client:google-oauth-client-servlet:1.19.0" level="project" />
32+
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client-jdo:1.19.0" level="project" />
33+
<orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
34+
<orderEntry type="library" name="Maven: com.google.api-client:google-api-client-servlet:1.19.0" level="project" />
35+
<orderEntry type="library" name="Maven: javax.jdo:jdo2-api:2.3-eb" level="project" />
36+
<orderEntry type="library" name="Maven: javax.transaction:transaction-api:1.1" level="project" />
37+
<orderEntry type="library" name="Maven: com.google.http-client:google-http-client-appengine:1.19.0" level="project" />
38+
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
39+
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
40+
<orderEntry type="library" name="Maven: joda-time:joda-time:2.6" level="project" />
41+
<orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
42+
<orderEntry type="library" name="Maven: com.google.apis:google-api-services-storage:v1-rev23-1.19.0" level="project" />
43+
<orderEntry type="library" name="Maven: com.google.apis:google-api-services-datastore:v1beta2-rev23-1.19.0" level="project" />
44+
<orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:3.3" level="project" />
45+
<orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:3.1" level="project" />
46+
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.1" level="project" />
47+
</component>
48+
</module>

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/RetryHelper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ public int getAttemptNumber() {
122122
}
123123

124124
@VisibleForTesting
125-
static final void setContext(Context ctx) {
125+
static void setContext(Context ctx) {
126126
if (ctx == null) {
127127
context.remove();
128128
} else {
129129
context.set(ctx);
130130
}
131131
}
132132

133-
static final Context getContext() {
133+
static Context getContext() {
134134
return context.get();
135135
}
136136

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/BatchWriterImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class BatchWriterImpl implements BatchWriter {
3434

3535
protected void checkActive() {
3636
if (!active) {
37-
throwInvalidRequest(getName() + " is no longer active");
37+
throw throwInvalidRequest(getName() + " is no longer active");
3838
}
3939
}
4040

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/Blob.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ public boolean equals(Object obj) {
6060
if (obj == this) {
6161
return true;
6262
}
63-
if (!(obj instanceof Blob)) {
64-
return false;
65-
}
66-
return byteString.equals(((Blob) obj).byteString);
63+
return obj instanceof Blob && byteString.equals(((Blob) obj).byteString);
6764
}
6865

6966
/**
@@ -113,7 +110,7 @@ public void copyTo(ByteBuffer target) {
113110
/**
114111
* Copies bytes into a buffer.
115112
*
116-
* @throws java.io.IndexOutOfBoundsException if an offset or size is negative or too large
113+
* @throws IndexOutOfBoundsException if an offset or size is negative or too large
117114
*/
118115
public void copyTo(byte[] target) {
119116
byteString.copyTo(target, 0, 0, length());

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/Cursor.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ public boolean equals(Object obj) {
3838
if (obj == this) {
3939
return true;
4040
}
41-
if (!(obj instanceof Cursor)) {
42-
return false;
43-
}
44-
return byteString.equals(((Cursor) obj).byteString);
41+
return obj instanceof Cursor && byteString.equals(((Cursor) obj).byteString);
4542
}
4643

4744
@Override
@@ -65,7 +62,7 @@ public String toUrlSafe() {
6562
try {
6663
return URLEncoder.encode(toPb().toString(), UTF_8.name());
6764
} catch (UnsupportedEncodingException e) {
68-
throw new IllegalStateException("Unxpeced encoding exception", e);
65+
throw new IllegalStateException("Unexpected encoding exception", e);
6966
}
7067
}
7168

@@ -77,7 +74,7 @@ public static Cursor fromUrlSafe(String urlSafe) {
7774
String utf8Str = URLDecoder.decode(urlSafe, UTF_8.name());
7875
return fromPb(DatastoreV1.Value.parseFrom(utf8Str.getBytes()));
7976
} catch (UnsupportedEncodingException | InvalidProtocolBufferException e) {
80-
throw new IllegalStateException("Unxpeced decoding exception", e);
77+
throw new IllegalStateException("Unexpected decoding exception", e);
8178
}
8279
}
8380

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/DatastoreService.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface DatastoreService extends DatastoreReaderWriter {
1515
/**
1616
* Returns a new Datastore transaction.
1717
*
18-
* @throws DatastoreServiceExcepiton upon failure
18+
* @throws DatastoreServiceException upon failure
1919
*/
2020
Transaction newTransaction(TransactionOption... options);
2121

@@ -30,42 +30,42 @@ public interface DatastoreService extends DatastoreReaderWriter {
3030
* The returned key will have the same information (dataset, kind, namespace and ancestors)
3131
* as the given key and will have a newly assigned id.
3232
*
33-
* @throws DatastoreServiceExcepiton upon failure
33+
* @throws DatastoreServiceException upon failure
3434
*/
3535
Key allocateId(PartialKey key);
3636

3737
/**
3838
* Returns a list of keys using the allocated ids ordered by the input.
3939
*
4040
* @see #allocateId(PartialKey)
41-
* @throws DatastoreServiceExcepiton upon failure
41+
* @throws DatastoreServiceException upon failure
4242
*/
4343
Iterator<Key> allocateId(PartialKey key, PartialKey... others);
4444

4545
/**
4646
* {@inheritDoc}
47-
* @throws DatastoreServiceExcepiton upon failure
47+
* @throws DatastoreServiceException upon failure
4848
*/
4949
@Override
5050
void add(Entity... entity);
5151

5252
/**
5353
* {@inheritDoc}
54-
* @throws DatastoreServiceExcepiton upon failure
54+
* @throws DatastoreServiceException upon failure
5555
*/
5656
@Override
5757
void update(Entity... entity);
5858

5959
/**
6060
* {@inheritDoc}
61-
* @throws DatastoreServiceExcepiton upon failure
61+
* @throws DatastoreServiceException upon failure
6262
*/
6363
@Override
6464
void put(Entity... entity);
6565

6666
/**
6767
* {@inheritDoc}
68-
* @throws DatastoreServiceExcepiton upon failure
68+
* @throws DatastoreServiceException upon failure
6969
*/
7070
@Override
7171
void delete(Key... key);

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/DateTime.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ public boolean equals(Object obj) {
4242
if (obj == this) {
4343
return true;
4444
}
45-
if (!(obj instanceof DateTime)) {
46-
return false;
47-
}
48-
return timestampMicroseconds == ((DateTime) obj).timestampMicroseconds;
45+
return obj instanceof DateTime && timestampMicroseconds == ((DateTime) obj).timestampMicroseconds;
4946
}
5047

5148
public long timestampMicroseconds() {

‎branches/tswast-patch-1/src/main/java/com/google/gcloud/datastore/GqlQuery.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@
2727
* <h3>A usage example:</h3>
2828
*
2929
* <p>When the type of the results is known the preferred usage would be:
30-
* <pre> {@code
31-
* Query<Entity> query = GqlQuery.builder(Query.Type.FULL, "select * from kind").build();
32-
* QueryResult<Entity> results = datastore.run(query);
30+
* <pre>{@code
31+
* Query&lt;Entity&gt; query = GqlQuery.builder(Query.Type.FULL, "select * from kind").build();
32+
* QueryResult&lt;Entity&gt; results = datastore.run(query);
3333
* while (results.hasNext()) {
3434
* Entity entity = results.next();
3535
* ...
3636
* }
3737
* } </pre>
3838
*
3939
* <p>When the type of the results is unknown you can use this approach:
40-
* <pre> {@code
41-
* Query<?> query = GqlQuery.builder("select __key__ from kind").build();
42-
* QueryResult<?> results = datastore.run(query);
40+
* <pre>{@code
41+
* Query&lt;?&gt; query = GqlQuery.builder("select __key__ from kind").build();
42+
* QueryResult&lt;?&gt; results = datastore.run(query);
4343
* if (Key.class.isAssignableFrom(results.resultClass())) {
44-
* QueryResult<Key> keys = (QueryResult<Key>) results;
44+
* QueryResult&lt;Key&gt; keys = (QueryResult&lt;Key&gt;) results;
4545
* while (keys.hasNext()) {
4646
* Key key = keys.next();
4747
* ...

0 commit comments

Comments
 (0)