scopes() {
+ return SCOPES;
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ @Override
+ public int hashCode() {
+ return baseHashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof BigQueryOptions)) {
+ return false;
+ }
+ BigQueryOptions other = (BigQueryOptions) obj;
+ return baseEquals(other);
+ }
+
+ public static Builder builder() {
+ return new Builder();
+ }
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
new file mode 100644
index 000000000000..4acaa40ca851
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+/**
+ * A client to Google Cloud BigQuery.
+ *
+ * A simple usage example:
+ *
{@code
+ * //TODO(mziccard): add code example
+ * }
+ *
+ * @see Google Cloud BigQuery
+ */
+package com.google.gcloud.bigquery;
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
new file mode 100644
index 000000000000..7cce35ab3eb9
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpc.java
@@ -0,0 +1,141 @@
+/*
+ * 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.gcloud.spi;
+
+import com.google.api.services.bigquery.model.Dataset;
+import com.google.api.services.bigquery.model.GetQueryResultsResponse;
+import com.google.api.services.bigquery.model.Job;
+import com.google.api.services.bigquery.model.JobReference;
+import com.google.api.services.bigquery.model.QueryRequest;
+import com.google.api.services.bigquery.model.QueryResponse;
+import com.google.api.services.bigquery.model.Table;
+import com.google.api.services.bigquery.model.TableDataInsertAllRequest;
+import com.google.api.services.bigquery.model.TableDataInsertAllResponse;
+import com.google.api.services.bigquery.model.TableReference;
+import com.google.api.services.bigquery.model.TableRow;
+import com.google.gcloud.bigquery.BigQueryException;
+
+import java.util.Map;
+
+public interface BigQueryRpc {
+
+ // These options are part of the Google Cloud BigQuery query parameters
+ enum Option {
+ QUOTA_USER("quotaUser"),
+ USER_IP("userIp"),
+ FIELDS("fields"),
+ DELETE_CONTENTS("deleteContents"),
+ ALL_DATASETS("all"),
+ ALL_USERS("allUsers"),
+ MAX_RESULTS("maxResults"),
+ PAGE_TOKEN("pageToken"),
+ START_INDEX("startIndex"),
+ STATE_FILTER("stateFilter"),
+ TIMEOUT("timeoutMs");
+
+ private final String value;
+
+ Option(String value) {
+ this.value = value;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ @SuppressWarnings("unchecked")
+ T get(Map options) {
+ return (T) options.get(this);
+ }
+
+ String getString(Map options) {
+ return get(options);
+ }
+
+ Long getLong(Map options) {
+ return get(options);
+ }
+
+ Boolean getBoolean(Map options) {
+ return get(options);
+ }
+ }
+
+ class Tuple {
+
+ private final X x;
+ private final Y y;
+
+ private Tuple(X x, Y y) {
+ this.x = x;
+ this.y = y;
+ }
+
+ public static Tuple of(X x, Y y) {
+ return new Tuple<>(x, y);
+ }
+
+ public X x() {
+ return x;
+ }
+
+ public Y y() {
+ return y;
+ }
+ }
+
+ Dataset getDataset(String datasetId, Map options) throws BigQueryException;
+
+ Tuple> listDatasets(Map options) throws BigQueryException;
+
+ Dataset create(Dataset dataset, Map options) throws BigQueryException;
+
+ boolean deleteDataset(String datasetId, Map options) throws BigQueryException;
+
+ Dataset patch(Dataset dataset, Map options) throws BigQueryException;
+
+ Table getTable(String datasetId, String tableId, Map options) throws BigQueryException;
+
+ Tuple> listTables(String dataset, Map options)
+ throws BigQueryException;
+
+ Table create(Table table, Map options) throws BigQueryException;
+
+ boolean deleteTable(String datasetId, String tableId, Map options)
+ throws BigQueryException;
+
+ Table patch(Table table, Map options) throws BigQueryException;
+
+ TableDataInsertAllResponse insertAll(TableReference table, TableDataInsertAllRequest request,
+ Map options) throws BigQueryException;
+
+ Tuple> listTableData(String datasetId, String tableId,
+ Map options) throws BigQueryException;
+
+ Job getJob(String jobId, Map options) throws BigQueryException;
+
+ Tuple> listJobs(Map options) throws BigQueryException;
+
+ Job create(Job job, Map options) throws BigQueryException;
+
+ boolean cancel(String jobId, Map options) throws BigQueryException;
+
+ GetQueryResultsResponse getQueryResults(JobReference job, Map options)
+ throws BigQueryException;
+
+ QueryResponse query(QueryRequest request, Map options) throws BigQueryException;
+}
diff --git a/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java
new file mode 100644
index 000000000000..2706868756a5
--- /dev/null
+++ b/gcloud-java-bigquery/src/main/java/com/google/gcloud/spi/BigQueryRpcFactory.java
@@ -0,0 +1,26 @@
+/*
+ * 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.gcloud.spi;
+
+import com.google.gcloud.bigquery.BigQueryOptions;
+
+/**
+ * An interface for BigQuery RPC factory.
+ * Implementation will be loaded via {@link java.util.ServiceLoader}.
+ */
+public interface BigQueryRpcFactory extends ServiceRpcFactory {
+}
diff --git a/gcloud-java-core/README.md b/gcloud-java-core/README.md
index 2a3be300f4ac..032127540d19 100644
--- a/gcloud-java-core/README.md
+++ b/gcloud-java-core/README.md
@@ -12,7 +12,7 @@ This module provides common functionality required by service-specific modules o
Quickstart
----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
```xml
com.google.gcloud
@@ -20,6 +20,14 @@ Add this to your pom.xml file
0.0.10
```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-core:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-core" % "0.0.10"
+```
Java Versions
-------------
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
new file mode 100644
index 000000000000..cd0933426756
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/BaseServiceException.java
@@ -0,0 +1,54 @@
+/*
+ * 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.gcloud;
+
+/**
+ * Base class for all service exceptions.
+ */
+public class BaseServiceException extends RuntimeException {
+
+ private static final long serialVersionUID = 5028833760039966178L;
+
+ private final int code;
+ private final boolean retryable;
+
+ public BaseServiceException(int code, String message, boolean retryable) {
+ super(message);
+ this.code = code;
+ this.retryable = retryable;
+ }
+
+ public BaseServiceException(int code, String message, boolean retryable, Exception cause) {
+ super(message, cause);
+ this.code = code;
+ this.retryable = retryable;
+ }
+
+ /**
+ * Returns the code associated with this exception.
+ */
+ public int code() {
+ return code;
+ }
+
+ /**
+ * Returns {@code true} when it is safe to retry the operation that caused this exception.
+ */
+ public boolean retryable() {
+ return retryable;
+ }
+}
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 1be1f16115ad..898897833287 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -30,6 +30,7 @@
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
@@ -387,8 +388,18 @@ protected static String googleCloudProjectId() {
} else {
configDir = new File(System.getProperty("user.home"), ".config/gcloud");
}
- try (BufferedReader reader =
- new BufferedReader(new FileReader(new File(configDir, "properties")))) {
+ FileReader fileReader;
+ try {
+ fileReader = new FileReader(new File(configDir, "configurations/config_default"));
+ } catch (FileNotFoundException newConfigFileNotFoundEx) {
+ try {
+ fileReader = new FileReader(new File(configDir, "properties"));
+ } catch (FileNotFoundException oldConfigFileNotFoundEx) {
+ // return null if we can't find config file
+ return null;
+ }
+ }
+ try (BufferedReader reader = new BufferedReader(fileReader)) {
String line;
String section = null;
Pattern projectPattern = Pattern.compile("^project\\s*=\\s*(.*)$");
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
new file mode 100644
index 000000000000..f30fd3abfb79
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseServiceExceptionTest.java
@@ -0,0 +1,45 @@
+/*
+ * 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.gcloud;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link BaseServiceException}.
+ */
+public class BaseServiceExceptionTest {
+
+ private final int code = 1;
+ private final String message = "some message";
+ private final boolean retryable = true;
+
+ @Test
+ public void testBaseServiceException() {
+ BaseServiceException serviceException = new BaseServiceException(code, message, retryable);
+ assertEquals(serviceException.code(), code);
+ assertEquals(serviceException.getMessage(), message);
+ assertEquals(serviceException.getCause(), null);
+
+ Exception cause = new RuntimeException();
+ serviceException = new BaseServiceException(code, message, retryable, cause);
+ assertEquals(serviceException.code(), code);
+ assertEquals(serviceException.getMessage(), message);
+ assertEquals(serviceException.getCause(), cause);
+ }
+}
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index bbcdd9d8857c..8915f2d37a55 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -15,7 +15,7 @@ Java idiomatic client for [Google Cloud Datastore] (https://cloud.google.com/dat
Quickstart
----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
```xml
com.google.gcloud
@@ -23,6 +23,14 @@ Add this to your pom.xml file
0.0.10
```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-datastore:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.0.10"
+```
Example Application
--------------------
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
index 562578a26428..dded1d11875e 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreException.java
@@ -18,6 +18,7 @@
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableMap;
+import com.google.gcloud.BaseServiceException;
import com.google.gcloud.RetryHelper;
import com.google.gcloud.RetryHelper.RetryHelperException;
import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
@@ -26,21 +27,21 @@
import java.util.HashMap;
import java.util.Map;
-public class DatastoreException extends RuntimeException {
+public class DatastoreException extends BaseServiceException {
- private static final long serialVersionUID = 8170357898917041899L;
- private static final ImmutableMap REASON_TO_CODE;
- private static final ImmutableMap HTTP_TO_CODE;
+ private static final long serialVersionUID = -2336749234060754893L;
+ private static final ImmutableMap REASON_TO_ERROR;
+ private static final ImmutableMap HTTP_TO_ERROR;
- private final Code code;
+ private final DatastoreError error;
/**
- * An error code to represent the failure.
+ * Represents Datastore errors.
*
* @see Google Cloud
* Datastore error codes
*/
- public enum Code {
+ public enum DatastoreError {
ABORTED(Reason.ABORTED),
DEADLINE_EXCEEDED(Reason.DEADLINE_EXCEEDED),
@@ -57,29 +58,25 @@ public enum Code {
private final String description;
private final int httpStatus;
- Code(Reason reason) {
+ DatastoreError(Reason reason) {
this(reason.retryable(), reason.description(), reason.httpStatus());
}
- Code(boolean retryable, String description, int httpStatus) {
+ DatastoreError(boolean retryable, String description, int httpStatus) {
this.retryable = retryable;
this.description = description;
this.httpStatus = httpStatus;
}
- public String description() {
+ String description() {
return description;
}
- public int httpStatus() {
+ int httpStatus() {
return httpStatus;
}
- /**
- * Returns {@code true} if this exception is transient and the same request could be retried.
- * For any retry it is highly recommended to apply an exponential backoff.
- */
- public boolean retryable() {
+ boolean retryable() {
return retryable;
}
@@ -89,30 +86,31 @@ DatastoreException translate(DatastoreRpcException exception, String message) {
}
static {
- ImmutableMap.Builder builder = ImmutableMap.builder();
- Map httpCodes = new HashMap<>();
- for (Code code : Code.values()) {
- builder.put(code.name(), code);
- httpCodes.put(code.httpStatus(), code);
+ ImmutableMap.Builder builder = ImmutableMap.builder();
+ Map httpCodes = new HashMap<>();
+ for (DatastoreError error : DatastoreError.values()) {
+ builder.put(error.name(), error);
+ httpCodes.put(error.httpStatus(), error);
}
- REASON_TO_CODE = builder.build();
- HTTP_TO_CODE = ImmutableMap.copyOf(httpCodes);
+ REASON_TO_ERROR = builder.build();
+ HTTP_TO_ERROR = ImmutableMap.copyOf(httpCodes);
}
- public DatastoreException(Code code, String message, Exception cause) {
- super(MoreObjects.firstNonNull(message, code.description), cause);
- this.code = code;
+ public DatastoreException(DatastoreError error, String message, Exception cause) {
+ super(error.httpStatus(), MoreObjects.firstNonNull(message, error.description),
+ error.retryable(), cause);
+ this.error = error;
}
- public DatastoreException(Code code, String message) {
- this(code, message, null);
+ public DatastoreException(DatastoreError error, String message) {
+ this(error, message, null);
}
/**
- * Returns the code associated with this exception.
+ * Returns the DatastoreError associated with this exception.
*/
- public Code code() {
- return code;
+ public DatastoreError datastoreError() {
+ return error;
}
static DatastoreException translateAndThrow(RetryHelperException ex) {
@@ -122,35 +120,36 @@ static DatastoreException translateAndThrow(RetryHelperException ex) {
if (ex instanceof RetryHelper.RetryInterruptedException) {
RetryHelper.RetryInterruptedException.propagate();
}
- throw new DatastoreException(Code.UNKNOWN, ex.getMessage(), ex);
+ throw new DatastoreException(DatastoreError.UNKNOWN, ex.getMessage(), ex);
}
/**
- * Translate DatastoreException to DatastoreException based on their
+ * Translate DatastoreRpcExceptions to DatastoreExceptions based on their
* HTTP error codes. This method will always throw a new DatastoreException.
*
* @throws DatastoreException every time
*/
static DatastoreException translateAndThrow(DatastoreRpcException exception) {
String message = exception.getMessage();
- Code code = REASON_TO_CODE.get(exception.reason());
- if (code == null) {
- code = MoreObjects.firstNonNull(HTTP_TO_CODE.get(exception.httpStatus()), Code.UNKNOWN);
+ DatastoreError error = REASON_TO_ERROR.get(exception.reason());
+ if (error == null) {
+ error = MoreObjects.firstNonNull(
+ HTTP_TO_ERROR.get(exception.httpStatus()), DatastoreError.UNKNOWN);
}
- throw code.translate(exception, message);
+ throw error.translate(exception, message);
}
/**
- * Throw a DatastoreException with {@code FAILED_PRECONDITION} code and the {@code message}
+ * Throw a DatastoreException with {@code FAILED_PRECONDITION} error and the {@code message}
* in a nested exception.
*
* @throws DatastoreException every time
*/
static DatastoreException throwInvalidRequest(String massage, Object... params) {
- throw new DatastoreException(Code.FAILED_PRECONDITION, String.format(massage, params));
+ throw new DatastoreException(DatastoreError.FAILED_PRECONDITION, String.format(massage, params));
}
static DatastoreException propagateUserException(Exception ex) {
- throw new DatastoreException(Code.UNKNOWN, ex.getMessage(), ex);
+ throw new DatastoreException(DatastoreError.UNKNOWN, ex.getMessage(), ex);
}
}
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
index a64a3531c19d..9ad836b15a4e 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreExceptionTest.java
@@ -19,7 +19,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import com.google.gcloud.datastore.DatastoreException.Code;
+import com.google.gcloud.datastore.DatastoreException.DatastoreError;
import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException;
import com.google.gcloud.spi.DatastoreRpc.DatastoreRpcException.Reason;
@@ -28,16 +28,16 @@
public class DatastoreExceptionTest {
@Test
- public void testCode() throws Exception {
+ public void testDatastoreError() throws Exception {
for (Reason reason : Reason.values()) {
- Code code = Code.valueOf(reason.name());
- assertEquals(reason.retryable(), code.retryable());
- assertEquals(reason.description(), code.description());
- assertEquals(reason.httpStatus(), code.httpStatus());
+ DatastoreError error = DatastoreError.valueOf(reason.name());
+ assertEquals(reason.retryable(), error.retryable());
+ assertEquals(reason.description(), error.description());
+ assertEquals(reason.httpStatus(), error.httpStatus());
}
- DatastoreException exception = new DatastoreException(Code.ABORTED, "bla");
- assertEquals(Code.ABORTED, exception.code());
+ DatastoreException exception = new DatastoreException(DatastoreError.ABORTED, "bla");
+ assertEquals(DatastoreError.ABORTED, exception.datastoreError());
}
@Test
@@ -47,7 +47,7 @@ public void testTranslateAndThrow() throws Exception {
DatastoreException.translateAndThrow(new DatastoreRpcException(reason));
fail("Exception expected");
} catch (DatastoreException ex) {
- assertEquals(reason.name(), ex.code().name());
+ assertEquals(reason.name(), ex.datastoreError().name());
}
}
}
@@ -58,7 +58,7 @@ public void testThrowInvalidRequest() throws Exception {
DatastoreException.throwInvalidRequest("message %s %d", "a", 1);
fail("Exception expected");
} catch (DatastoreException ex) {
- assertEquals(Code.FAILED_PRECONDITION, ex.code());
+ assertEquals(DatastoreError.FAILED_PRECONDITION, ex.datastoreError());
assertEquals("message a 1", ex.getMessage());
}
}
diff --git a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
index f639ca3fdac0..6afd40927264 100644
--- a/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
+++ b/gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/DatastoreTest.java
@@ -197,7 +197,7 @@ public void testTransactionWithRead() {
transaction.commit();
fail("Expecting a failure");
} catch (DatastoreException expected) {
- assertEquals(DatastoreException.Code.ABORTED, expected.code());
+ assertEquals(DatastoreException.DatastoreError.ABORTED, expected.datastoreError());
}
}
@@ -225,7 +225,7 @@ public void testTransactionWithQuery() {
transaction.commit();
fail("Expecting a failure");
} catch (DatastoreException expected) {
- assertEquals(DatastoreException.Code.ABORTED, expected.code());
+ assertEquals(DatastoreException.DatastoreError.ABORTED, expected.datastoreError());
}
}
diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md
index 366acd5de929..9afe16a2b1a5 100644
--- a/gcloud-java-examples/README.md
+++ b/gcloud-java-examples/README.md
@@ -12,7 +12,7 @@ Examples for gcloud-java (Java idiomatic client for [Google Cloud Platform][clou
Quickstart
----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
```xml
com.google.gcloud
@@ -20,6 +20,14 @@ Add this to your pom.xml file
0.0.10
```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-examples:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-examples" % "0.0.10"
+```
To run examples from your command line:
diff --git a/gcloud-java-storage/README.md b/gcloud-java-storage/README.md
index 717fd1f1f3e4..8722da76cec4 100644
--- a/gcloud-java-storage/README.md
+++ b/gcloud-java-storage/README.md
@@ -15,7 +15,7 @@ Java idiomatic client for [Google Cloud Storage] (https://cloud.google.com/stora
Quickstart
----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
```xml
com.google.gcloud
@@ -23,6 +23,14 @@ Add this to your pom.xml file
0.0.10
```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java-storage:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java-storage" % "0.0.10"
+```
Example Application
-------------------
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
index e354e3a6d427..c1075ae28c8b 100644
--- a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
+++ b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageException.java
@@ -16,8 +16,10 @@
package com.google.gcloud.storage;
+import com.google.gcloud.BaseServiceException;
import com.google.gcloud.RetryHelper;
import com.google.gcloud.RetryHelper.RetryHelperException;
+import com.google.gcloud.RetryHelper.RetryInterruptedException;
/**
* Storage service exception.
@@ -25,29 +27,13 @@
* @see Google Cloud
* Storage error codes
*/
-public class StorageException extends RuntimeException {
+public class StorageException extends BaseServiceException {
- private static final long serialVersionUID = -3748432005065428084L;
+ private static final long serialVersionUID = 8088235105953640145L;
private static final int UNKNOWN_CODE = -1;
- private final int code;
- private final boolean retryable;
-
public StorageException(int code, String message, boolean retryable) {
- super(message);
- this.code = code;
- this.retryable = retryable;
- }
-
- /**
- * Returns the code associated with this exception.
- */
- public int code() {
- return code;
- }
-
- public boolean retryable() {
- return retryable;
+ super(code, message, retryable);
}
/**
diff --git a/gcloud-java/README.md b/gcloud-java/README.md
index 7e2eee84a8c4..baa1e5c53b1c 100644
--- a/gcloud-java/README.md
+++ b/gcloud-java/README.md
@@ -20,7 +20,7 @@ This client supports the following Google Cloud Platform services:
Quickstart
----------
-Add this to your pom.xml file
+If you are using Maven, add this to your pom.xml file
```xml
com.google.gcloud
@@ -28,6 +28,14 @@ Add this to your pom.xml file
0.0.10
```
+If you are using Gradle, add this to your dependencies
+```Groovy
+compile 'com.google.gcloud:gcloud-java:jar:0.0.10'
+```
+If you are using SBT, add this to your dependencies
+```Scala
+libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.10"
+```
Java Versions
-------------
diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index 26405bcd9db3..05ab5fb373d6 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -7,35 +7,37 @@ source ./utilities/integration_test_env.sh
echo "Travis branch: " ${TRAVIS_BRANCH}
echo "Travis pull request: " ${TRAVIS_PULL_REQUEST}
echo "Travis JDK version: " ${TRAVIS_JDK_VERSION}
-if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
- mvn cobertura:cobertura coveralls:report
- SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
- if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
- # Deploy site if not a SNAPSHOT
- git config --global user.name "travis-ci"
- git config --global user.email "travis@travis-ci.org"
- git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages
- mkdir -p tmp_gh-pages/$SITE_VERSION
- mvn site -DskipTests=true
- mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/
- cd tmp_gh-pages
- cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/
- sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change
- git add $SITE_VERSION
- echo "" > index.html
- git add index.html
- echo "" > apidocs/index.html
- git add apidocs/index.html
- git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect."
- git config --global push.default simple
- git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
+if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" ]; then
+ mvn clean cobertura:cobertura coveralls:report
+ if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
+ SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)')
+ if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then
+ # Deploy site if not a SNAPSHOT
+ git config --global user.name "travis-ci"
+ git config --global user.email "travis@travis-ci.org"
+ git clone --branch gh-pages --single-branch https://github.com/GoogleCloudPlatform/gcloud-java/ tmp_gh-pages
+ mkdir -p tmp_gh-pages/$SITE_VERSION
+ mvn site -DskipTests=true
+ mvn site:stage -DtopSiteURL=http://googlecloudplatform.github.io/gcloud-java/site/${SITE_VERSION}/
+ cd tmp_gh-pages
+ cp -r ../target/staging/$SITE_VERSION/* $SITE_VERSION/
+ sed -i "s/{{SITE_VERSION}}/$SITE_VERSION/g" ${SITE_VERSION}/index.html # Update "Quickstart with Maven" to reflect version change
+ git add $SITE_VERSION
+ echo "" > index.html
+ git add index.html
+ echo "" > apidocs/index.html
+ git add apidocs/index.html
+ git commit -m "Added a new site for version $SITE_VERSION and updated the root directory's redirect."
+ git config --global push.default simple
+ git push --quiet "https://${CI_DEPLOY_USERNAME}:${CI_DEPLOY_PASSWORD}@github.com/GoogleCloudPlatform/gcloud-java.git" > /dev/null 2>&1
- cd ..
- utilities/update_docs_version.sh # Update version in READMEs
- mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
- else
- mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
+ cd ..
+ utilities/update_docs_version.sh # Update version in READMEs
+ mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
+ else
+ mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
+ fi
fi
else
echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."
diff --git a/utilities/update_docs_version.sh b/utilities/update_docs_version.sh
index d7e7bdbfb830..4b1641a0bd81 100755
--- a/utilities/update_docs_version.sh
+++ b/utilities/update_docs_version.sh
@@ -14,6 +14,8 @@ if [ "${RELEASED_VERSION##*-}" != "SNAPSHOT" ]; then
for item in ${module_folders[*]}
do
sed -ri "s/[0-9]+\.[0-9]+\.[0-9]+<\/version>/${RELEASED_VERSION}<\/version>/g" ${item}/README.md
+ sed -ri "s/:[0-9]+\.[0-9]+\.[0-9]+'/:${RELEASED_VERSION}'/g" ${item}/README.md
+ sed -ri "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${RELEASED_VERSION}\"/g" ${item}/README.md
done
git add README.md */README.md