Skip to content

Commit cff1146

Browse files
aozarovaozarov
committed
---
yaml --- r: 621 b: refs/heads/gh-pages c: 14ab215 h: refs/heads/master i: 619: 6a66ce7 v: v3
1 parent d0f8496 commit cff1146

6 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
refs/heads/master: 92537786d4fa0a9fb51215f27d3d0581f4fe3a65
33
refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
4-
refs/heads/gh-pages: d1d8d71b67d9b76efbd03d45f94312e87f0c35f6
4+
refs/heads/gh-pages: 14ab215aecd74f2bcf2d1cbafa6ff63eed170a30

‎branches/gh-pages/src/main/java/com/google/gcloud/RetryHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.google.gcloud;
22

33
import static com.google.common.base.Preconditions.checkNotNull;
4-
import static java.lang.Math.max;
5-
import static java.lang.Math.min;
6-
import static java.lang.Math.pow;
7-
import static java.lang.Math.random;
4+
import static java.lang.StrictMath.max;
5+
import static java.lang.StrictMath.min;
6+
import static java.lang.StrictMath.pow;
7+
import static java.lang.StrictMath.random;
88
import static java.util.concurrent.TimeUnit.MILLISECONDS;
99

1010
import com.google.common.annotations.VisibleForTesting;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public boolean equals(Object obj) {
148148
if (!(obj instanceof BaseKey)) {
149149
return false;
150150
}
151-
PartialKey other = (PartialKey) obj;
151+
BaseKey other = (BaseKey) obj;
152152
return Objects.equals(dataset(), other.dataset())
153153
&& Objects.equals(namespace(), other.namespace())
154154
&& Objects.equals(path(), other.path());

‎branches/gh-pages/src/main/java/com/google/gcloud/datastore/DatastoreServiceException.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public enum Code {
3939
INTERNAL(false, "Server returned an error", 500),
4040
UNKNOWN(false, "Unknown failure", -1);
4141

42-
private final boolean isTransient;
43-
private final String defaultMessage;
42+
private final boolean retriable;
43+
private final String message;
4444
private final int httpCode;
4545

46-
Code(boolean isTransient, String msg, int httpCode) {
47-
this.isTransient = isTransient;
48-
defaultMessage = msg;
46+
Code(boolean retriable, String message, int httpCode) {
47+
this.retriable = retriable;
48+
this.message = message;
4949
this.httpCode = httpCode;
5050
}
5151

@@ -57,12 +57,12 @@ public Integer httpCode() {
5757
* Returns {@code true} if this exception is transient and the same request could be retried.
5858
* For any retry it is highly recommended to apply an exponential backoff.
5959
*/
60-
public boolean isTransient() {
61-
return isTransient;
60+
public boolean isRetriable() {
61+
return retriable;
6262
}
6363

64-
DatastoreServiceException translate(DatastoreException exception, String msg) {
65-
return new DatastoreServiceException(this, msg, exception);
64+
DatastoreServiceException translate(DatastoreException exception, String message) {
65+
return new DatastoreServiceException(this, message, exception);
6666
}
6767
}
6868

@@ -77,13 +77,13 @@ DatastoreServiceException translate(DatastoreException exception, String msg) {
7777
HTTP_TO_CODE = ImmutableMap.copyOf(httpCodes);
7878
}
7979

80-
public DatastoreServiceException(Code code, String msg, Exception cause) {
81-
super(MoreObjects.firstNonNull(msg, code.defaultMessage), cause);
80+
public DatastoreServiceException(Code code, String message, Exception cause) {
81+
super(MoreObjects.firstNonNull(message, code.message), cause);
8282
this.code = code;
8383
}
8484

85-
public DatastoreServiceException(Code code, String msg) {
86-
this(code, msg, null);
85+
public DatastoreServiceException(Code code, String message) {
86+
this(code, message, null);
8787
}
8888

8989
/**
@@ -131,12 +131,12 @@ static DatastoreServiceException translateAndThrow(DatastoreException exception)
131131

132132

133133
/**
134-
* Throw a DatastoreServiceException with {@code FAILED_PRECONDITION} code and the {@code msg}
134+
* Throw a DatastoreServiceException with {@code FAILED_PRECONDITION} code and the {@code message}
135135
* in a nested exception.
136136
*
137137
* @throws DatastoreServiceException every time
138138
*/
139-
static DatastoreServiceException throwInvalidRequest(String msg, Object... params) {
140-
throw new DatastoreServiceException(Code.FAILED_PRECONDITION, String.format(msg, params));
139+
static DatastoreServiceException throwInvalidRequest(String massage, Object... params) {
140+
throw new DatastoreServiceException(Code.FAILED_PRECONDITION, String.format(massage, params));
141141
}
142142
}

‎branches/gh-pages/src/main/java/com/google/gcloud/datastore/DatastoreServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public RetryResult afterEval(Exception exception, RetryResult retryResult) {
3737
@Override
3838
public RetryResult beforeEval(Exception exception) {
3939
if (exception instanceof DatastoreServiceException) {
40-
boolean isTransient = ((DatastoreServiceException) exception).code().isTransient();
41-
return isTransient
40+
boolean isRetriable = ((DatastoreServiceException) exception).code().isRetriable();
41+
return isRetriable
4242
? ExceptionHandler.Interceptor.RetryResult.RETRY
4343
: ExceptionHandler.Interceptor.RetryResult.ABORT;
4444
}

‎branches/gh-pages/src/test/java/com/google/gcloud/RetryParamsTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@ public void testSetAndCopy() {
6262
public void testBadSettings() {
6363
RetryParams.Builder builder = RetryParams.builder();
6464
builder.initialRetryDelayMillis(-1);
65-
builder = verifyFailure(builder);
65+
builder = assertFailure(builder);
6666
builder.maxRetryDelayMillis(RetryParams.getDefaultInstance().getInitialRetryDelayMillis() - 1);
67-
builder = verifyFailure(builder);
67+
builder = assertFailure(builder);
6868
builder.retryDelayBackoffFactor(-1);
69-
builder = verifyFailure(builder);
69+
builder = assertFailure(builder);
7070
builder.retryMinAttempts(-1);
71-
builder = verifyFailure(builder);
71+
builder = assertFailure(builder);
7272
builder.retryMaxAttempts(RetryParams.getDefaultInstance().getRetryMinAttempts() - 1);
73-
builder = verifyFailure(builder);
73+
builder = assertFailure(builder);
7474
builder.totalRetryPeriodMillis(-1);
75-
builder = verifyFailure(builder);
75+
builder = assertFailure(builder);
7676
// verify that it is OK for min and max to be equal
7777
builder.retryMaxAttempts(RetryParams.getDefaultInstance().getRetryMinAttempts());
7878
builder.maxRetryDelayMillis(RetryParams.getDefaultInstance().getInitialRetryDelayMillis());
7979
builder.build();
8080
}
8181

82-
private static Builder verifyFailure(Builder builder) {
82+
private static Builder assertFailure(Builder builder) {
8383
try {
8484
builder.build();
8585
fail("Expected IllegalArgumentException");

0 commit comments

Comments
 (0)