Skip to content

Commit 6cd05d6

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 1321 b: refs/heads/update-datastore c: a77fd34 h: refs/heads/master i: 1319: 617a9e4 v: v3
1 parent 7918ee4 commit 6cd05d6

122 files changed

Lines changed: 1526 additions & 7609 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ refs/heads/gh-pages: d1b373c30c176edc08692348167bec3a244bb823
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
66
refs/heads/pubsub-alpha: dea33f5d017ff85c14573b4a06c6b1f2c4bbe2b0
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
8-
refs/heads/update-datastore: 0dd3d971bafc2d724787a76e69fdde6dedba51df
8+
refs/heads/update-datastore: a77fd34b49d29413df9c5816541b742e1293dbaf

‎branches/update-datastore/.travis.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ before_install:
88
- git clone -b travis `git config --get remote.origin.url` target/travis
99
- cp target/travis/settings.xml ~/.m2/settings.xml
1010
install: mvn install -DskipTests=true -Dgpg.skip=true
11-
script:
12-
- utilities/verify.sh
11+
script: mvn verify
1312
branches:
1413
only:
1514
- master
@@ -21,5 +20,3 @@ env:
2120
- secure: "CUM2l73KFm7U4eDsUKkh1WyEUzF3v94Ltvs7MnKU9olE1dNp3YmRBL9Lqhx3hSDqm/xv0ETQsPy29Fs2+VFkhQQxSley6iS/4trr2fioTB680txfXo/zDdmGSP1q1/U40fv1S+jvuBRAhDV5W+8dhWOGtzMH0tJp/TszeDGlmCY="
2221
- secure: "YBbdzseg5yDFpQIiMoc3P2BTmqef4o+KAvrLMEbobXjIkiglUQ7UHCoRWClX74fTKAwuC7JvK7o5xJGLnaY43jJADXrGtE8/d44HNJaieE67mNosDYtOiA0iI2uIRFCAnXJCZ8f/iHx2xVMHMNWlwyoil4IUcjj+D7FRcsT5alE="
2322
- secure: "Od7BwllgFXVfzFe8ooTNm05TR+Xd5QjHW0oqhU8vclaQs2oX4e0eNIsebXQfLi3xDgd1pz5uUQC/Z4S0NqACwyUuUvPdGYYmRPTR7Dh8HgGJ4ojSdN3RwaHsxUqG7Ajts9rIHOtRpY28xOChVRNX0Z7eAPlvxYU4Ed2ZEo356r0="
24-
- secure: "ROxa8HHuba+Dfixljq6poW1+Uwv8EaZUtTTTB7KEtAHJRN8rwoNS4TC0U0PEHcYAL+ivxP3zIfWOCoWreJGoa+V8y9BtLSuamUj/SSsuoHRdJjq5BmcHI/77P11HAzCH6Ul/GxsRB52/IRHwJyfKkh8XUMVSsCl7AG4CKUgt63Y="
25-
- secure: "MKZ3y6IYp3Z67T+BO4Brw+my8sRMSMdWWgvUcyBpwQZ64w7ccHJCce4W8WHCPNko/eczHHCJELPG28VNyPTWIV/Jt2ZJ6L9qLCjsQpDPOdJdDaAKc9Df4sm8fB0FBiPVDwMYPQF1/Sy2gK7FZf0YR3LOeoyzswRgmj5bQMdVEeU="

‎branches/update-datastore/README.md‎

Lines changed: 26 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
99

1010
- [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
1111
- [API Documentation] (http://googlecloudplatform.github.io/gcloud-java/apidocs)
12+
- [Examples] (http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/examples/package-summary.html)
1213

1314
This client supports the following Google Cloud Platform services:
1415

1516
- [Google Cloud Datastore] (#google-cloud-datastore)
16-
- [Google Cloud Storage] (#google-cloud-storage)
17+
18+
<!---
19+
- [Google Cloud Storage] (https://cloud.google.com/storage/)
20+
--->
1721

1822
> Note: This client is a work-in-progress, and may occasionally
1923
> make backwards-incompatible changes.
@@ -25,39 +29,32 @@ Add this to your pom.xml file
2529
<dependency>
2630
<groupId>com.google.gcloud</groupId>
2731
<artifactId>gcloud-java</artifactId>
28-
<version>0.0.10</version>
32+
<version>0.0.7</version>
2933
</dependency>
3034
```
3135

36+
<!---
3237
Example Applications
3338
--------------------
3439
35-
- [`DatastoreExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/DatastoreExample.java) - A simple command line interface for the Cloud Datastore
36-
- Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/DatastoreExample.html).
37-
- [`StorageExample`](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/src/main/java/com/google/gcloud/examples/StorageExample.java) - A simple command line interface providing some of Cloud Storage's functionality
38-
- Read more about using this application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/StorageExample.html).
39-
40-
Authentication
41-
--------------
42-
43-
There are multiple ways to authenticate to use Google Cloud services.
44-
45-
1. When using `gcloud-java` libraries from within Compute/App Engine, no additional authentication steps are necessary.
46-
2. When using `gcloud-java` libraries elsewhere, there are two options:
47-
* [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts). Supply a path to the downloaded JSON credentials file when building the options supplied to datastore/storage constructor.
48-
* If running locally for development/testing, you can use use [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en). To use the SDK authentication, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already. Then login using the SDK (`gcloud auth login` in command line), and set your current project using `gcloud config set project PROJECT_ID`.
40+
- `java-datastore-sample`_ - A sample using Cloud Datastore
41+
.. _java-datastore-sample: https://github.com/GoogleCloudPlatform/java-datastore-sample
42+
--->
4943

5044
Google Cloud Datastore
5145
----------------------
5246

53-
- [API Documentation][datastore-api]
54-
- [Official Documentation][cloud-datastore-docs]
47+
Google [Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for
48+
storing non-relational data. Cloud Datastore automatically scales with
49+
your users and supports ACID transactions, high availability of reads and
50+
writes, strong consistency for reads and ancestor queries, and eventual
51+
consistency for all other queries.
5552

56-
*Follow the [activation instructions][cloud-datastore-activation] to use the Google Cloud Datastore API with your project.*
53+
See the [Google Cloud Datastore docs][cloud-datastore-activation] for more details on how to activate
54+
Cloud Datastore for your project.
5755

58-
#### Preview
59-
60-
Here is a code snippet showing a simple usage example from within Compute/App Engine. Note that you must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
56+
See the ``gcloud-java`` API [datastore documentation][datastore-api] to learn how to interact
57+
with the Cloud Datastore using this Client Library.
6158

6259
```java
6360
import com.google.gcloud.datastore.Datastore;
@@ -68,7 +65,8 @@ import com.google.gcloud.datastore.Entity;
6865
import com.google.gcloud.datastore.Key;
6966
import com.google.gcloud.datastore.KeyFactory;
7067

71-
Datastore datastore = DatastoreFactory.instance().get(DatastoreOptions.getDefaultInstance());
68+
DatastoreOptions options = DatastoreOptions.builder().projectId(PROJECT_ID).build();
69+
Datastore datastore = DatastoreFactory.instance().get(options);
7270
KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
7371
Key key = keyFactory.newKey(keyName);
7472
Entity entity = datastore.get(key);
@@ -88,59 +86,20 @@ if (entity == null) {
8886
}
8987
```
9088

91-
Google Cloud Storage
92-
----------------------
93-
94-
- [API Documentation][storage-api]
95-
- [Official Documentation][cloud-storage-docs]
96-
97-
*Follow the [activation instructions][cloud-storage-activation] to use the Google Cloud Storage API with your project.*
89+
Contributing
90+
------------
9891

99-
#### Preview
92+
Contributions to this library are always welcome and highly encouraged.
10093

101-
Here is a code snippet showing a simple usage example from within Compute/App Engine. Note that you must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
94+
See [CONTRIBUTING] for more information on how to get started.
10295

103-
```java
104-
import static java.nio.charset.StandardCharsets.UTF_8;
105-
106-
import com.google.gcloud.storage.Blob;
107-
import com.google.gcloud.storage.BlobId;
108-
import com.google.gcloud.storage.Storage;
109-
import com.google.gcloud.storage.StorageFactory;
110-
import com.google.gcloud.storage.StorageOptions;
111-
112-
import java.nio.ByteBuffer;
113-
import java.nio.channels.WritableByteChannel;
114-
115-
StorageOptions options = StorageOptions.builder().projectId("project").build();
116-
Storage storage = StorageFactory.instance().get(options);
117-
BlobId blobId = BlobId.of("bucket", "blob_name");
118-
Blob blob = Blob.load(storage, blobId);
119-
if (blob == null) {
120-
BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
121-
storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));
122-
} else {
123-
System.out.println("Updating content for " + blobId.name());
124-
byte[] prevContent = blob.content();
125-
System.out.println(new String(prevContent, UTF_8));
126-
WritableByteChannel channel = blob.writer();
127-
channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
128-
channel.close();
129-
}
130-
```
96+
Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
13197

13298
Java Versions
13399
-------------
134100

135101
Java 7 or above is required for using this client.
136102

137-
Testing
138-
-------
139-
140-
This library provides tools to help write tests for code that uses gcloud-java services.
141-
142-
See [TESTING] to read more about using our testing helpers.
143-
144103
Versioning
145104
----------
146105

@@ -150,15 +109,6 @@ It is currently in major version zero (``0.y.z``), which means that anything
150109
may change at any time and the public API should not be considered
151110
stable.
152111

153-
Contributing
154-
------------
155-
156-
Contributions to this library are always welcome and highly encouraged.
157-
158-
See [CONTRIBUTING] for more information on how to get started.
159-
160-
Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information.
161-
162112
License
163113
-------
164114

@@ -168,7 +118,6 @@ Apache 2.0 - See [LICENSE] for more information.
168118
[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
169119
[code-of-conduct]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CODE_OF_CONDUCT.md
170120
[LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
171-
[TESTING]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/TESTING.md
172121
[cloud-platform]: https://cloud.google.com/
173122
[cloud-datastore]: https://cloud.google.com/datastore/docs
174123
[cloud-datastore-docs]: https://cloud.google.com/datastore/docs
@@ -181,5 +130,3 @@ Apache 2.0 - See [LICENSE] for more information.
181130
[cloud-storage]: https://cloud.google.com/storage/
182131
[cloud-storage-docs]: https://cloud.google.com/storage/docs/overview
183132
[cloud-storage-create-bucket]: https://cloud.google.com/storage/docs/cloud-console#_creatingbuckets
184-
[cloud-storage-activation]: https://cloud.google.com/storage/docs/signup
185-
[storage-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/storage/package-summary.html

‎branches/update-datastore/RELEASING.md‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎branches/update-datastore/TESTING.md‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎branches/update-datastore/gcloud-java-core/README.md‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
Google Cloud Java Client -- Core
2-
=========================================
1+
Google Cloud Java Client
2+
==========================
33

4-
This module provides common functionality required by service-specific modules of this library.
4+
Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
55

66
[![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java)
77
[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
8-
[![Maven](https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-core.svg)](https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-core.svg)
98

109
- [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
11-
- [API Documentation] (http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/package-summary.html)
10+
- [API Documentation] (http://googlecloudplatform.github.io/gcloud-java/apidocs)
11+
- [Examples] (http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/examples/package-summary.html)
12+
13+
This module provides common functionality and is required by the other service specific modules.
1214

1315
Quickstart
1416
----------
@@ -17,22 +19,22 @@ Add this to your pom.xml file
1719
<dependency>
1820
<groupId>com.google.gcloud</groupId>
1921
<artifactId>gcloud-java-core</artifactId>
20-
<version>0.0.10</version>
22+
<version>0.0.7</version>
2123
</dependency>
2224
```
2325

24-
Java Versions
25-
-------------
26-
27-
Java 7 or above is required for using this client.
28-
2926
Contributing
3027
------------
3128

3229
Contributions to this library are always welcome and highly encouraged.
3330

3431
See [CONTRIBUTING] for more information on how to get started.
3532

33+
Java Versions
34+
-------------
35+
36+
Java 7 or above is required for using this client.
37+
3638
Versioning
3739
----------
3840

‎branches/update-datastore/gcloud-java-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.gcloud</groupId>
1313
<artifactId>gcloud-java-pom</artifactId>
14-
<version>0.0.11-SNAPSHOT</version>
14+
<version>0.0.8-SNAPSHOT</version>
1515
</parent>
1616
<dependencies>
1717
<dependency>
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>joda-time</groupId>
7676
<artifactId>joda-time</artifactId>
77-
<version>2.8.2</version>
77+
<version>RELEASE</version>
7878
<scope>compile</scope>
7979
</dependency>
8080
<dependency>

0 commit comments

Comments
 (0)