Skip to content

Commit 5f482a2

Browse files
aozarovaozarov
committed
---
yaml --- r: 5925 b: refs/heads/tswast-patch-1 c: 6935727 h: refs/heads/master i: 5923: 239fc92
1 parent 8d0dba9 commit 5f482a2

101 files changed

Lines changed: 1856 additions & 2120 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
@@ -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: d4d9427abc0ae275c2244f83db05127f657745f7
60+
refs/heads/tswast-patch-1: 6935727fdfa421765efc9c95f99e4cfac816cc6b
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
language: java
1+
nguage: java
22
jdk:
33
- oraclejdk8
44
- oraclejdk7
@@ -7,8 +7,8 @@ before_install:
77
- mvn clean
88
- git clone -b travis `git config --get remote.origin.url` target/travis
99
- cp target/travis/settings.xml ~/.m2/settings.xml
10-
install: mvn install
11-
script: mvn verify
10+
install: mvn install -Dgpg.skip=true
11+
script: mvn verify -Dgpg.skip=true
1212
branches:
1313
only:
1414
- master

‎branches/tswast-patch-1/README.md‎

Lines changed: 22 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,63 @@
1-
Google Cloud Java Client
2-
==========================
3-
4-
Java idiomatic client for [Google Cloud Platform][cloud-platform] services.
1+
Google Cloud for Java
2+
=====================
53

64
[![Build Status](https://travis-ci.org/GoogleCloudPlatform/gcloud-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/gcloud-java)
75
[![Coverage Status](https://coveralls.io/repos/GoogleCloudPlatform/gcloud-java/badge.svg?branch=master)](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
86

9-
- [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
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 client supports the following Google Cloud Platform services:
7+
Java idiomatic client for Google Cloud Platform services. Supported APIs include:
148

15-
- [Google Cloud Datastore] (https://cloud.google.com/datastore/)
9+
* Google Cloud Datastore
1610

17-
<!---
18-
- [Google Cloud Storage] (https://cloud.google.com/storage/)
19-
--->
2011

21-
> Note: This client is a work-in-progress, and may occasionally
12+
> Note: This package is a work-in-progress, and may occasionally
2213
> make backwards-incompatible changes.
2314
24-
Quickstart
25-
----------
26-
Add this to your pom.xml file
27-
```xml
28-
<dependency>
29-
<groupId>com.google.gcloud</groupId>
30-
<artifactId>gcloud-java</artifactId>
31-
<version>LATEST</version>
32-
</dependency>
33-
```
34-
35-
<!---
36-
Example Applications
37-
--------------------
3815

39-
- `java-datastore-sample`_ - A sample using Cloud Datastore
40-
.. _java-datastore-sample: https://github.com/GoogleCloudPlatform/java-datastore-sample
41-
--->
16+
Documentation and examples are available [here](http://googlecloudplatform.github.io/gcloud-java/apidocs).
4217

43-
Google Cloud Datastore
44-
----------------------
18+
## Google Cloud Datastore
4519

46-
Google [Cloud Datastore][cloud-datastore] is a fully managed, schemaless database for
47-
storing non-relational data. Cloud Datastore automatically scales with
48-
your users and supports ACID transactions, high availability of reads and
49-
writes, strong consistency for reads and ancestor queries, and eventual
20+
[Google Cloud Datastore][cloud-datastore] ([docs][cloud-datastore-docs]) is a fully
21+
managed, schemaless database for storing non-relational data. Cloud Datastore
22+
automatically scales with your users and supports ACID transactions, high availability
23+
of reads and writes, strong consistency for reads and ancestor queries, and eventual
5024
consistency for all other queries.
5125

52-
See the [Google Cloud Datastore docs][cloud-datastore-activation] for more details on how to activate
53-
Cloud Datastore for your project.
54-
55-
See the ``gcloud-java`` API [datastore documentation][datastore-api] to learn how to interact
56-
with the Cloud Datastore using this Client Library.
26+
Follow the [activation instructions][cloud-datastore-activation] to use the Google
27+
Cloud Datastore API with your project.
5728

5829
```java
5930
import com.google.gcloud.datastore.DatastoreService;
6031
import com.google.gcloud.datastore.DatastoreServiceFactory;
6132
import com.google.gcloud.datastore.DatastoreServiceOptions;
62-
import com.google.gcloud.datastore.DateTime;
6333
import com.google.gcloud.datastore.Entity;
6434
import com.google.gcloud.datastore.Key;
6535
import com.google.gcloud.datastore.KeyFactory;
6636

67-
DatastoreServiceOptions options = DatastoreServiceOptions.builder().dataset(DATASET).build();
68-
DatastoreService datastore = DatastoreServiceFactory.instance().get(options);
69-
KeyFactory keyFactory = datastore.newKeyFactory().kind(KIND);
37+
DatastoreServiceOptions options = DatastoreServiceOptions.builder().dataset("...").build();
38+
DatastoreService datastore = DatastoreServiceFactory.getDefault(options);
39+
KeyFactory keyFactory = new KeyFactory(datastore).kind("...");
7040
Key key = keyFactory.newKey(keyName);
7141
Entity entity = datastore.get(key);
7242
if (entity == null) {
7343
entity = Entity.builder(key)
7444
.set("name", "John Do")
7545
.set("age", 30)
76-
.set("access_time", DateTime.now())
46+
.set("updated", false)
7747
.build();
7848
datastore.put(entity);
79-
} else {
80-
System.out.println("Updating access_time for " + entity.getString("name"));
81-
entity = Entity.builder(entity)
82-
.set("access_time", DateTime.now())
83-
.build();
84-
datastore.update(entity);
8549
}
8650
```
8751

88-
Contributing
89-
------------
90-
91-
Contributions to this library are always welcome and highly encouraged.
92-
93-
See [CONTRIBUTING] for more information on how to get started.
94-
95-
Java Versions
96-
-------------
97-
98-
Java 7 or above is required for using this client.
99-
100-
Versioning
101-
----------
102-
103-
This library follows [Semantic Versioning] (http://semver.org/).
104-
105-
It is currently in major version zero (``0.y.z``), which means that anything
106-
may change at any time and the public API should not be considered
107-
stable.
108-
109-
License
110-
-------
111-
112-
Apache 2.0 - See [LICENSE] for more information.
52+
## Contributing
11353

54+
Contributions are welcome. Please, see the
55+
[CONTRIBUTING](https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md)
56+
document for details.
11457

115-
[CONTRIBUTING]:https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/CONTRIBUTING.md
116-
[LICENSE]: https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/LICENSE
117-
[cloud-platform]: https://cloud.google.com/
118-
[cloud-datastore]: https://cloud.google.com/datastore/docs
58+
[cloud-datastore]: https://cloud.google.com/datastore/
11959
[cloud-datastore-docs]: https://cloud.google.com/datastore/docs
12060
[cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate
121-
[datastore-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/datastore/package-summary.html
12261

12362
[cloud-pubsub]: https://cloud.google.com/pubsub/
12463
[cloud-pubsub-docs]: https://cloud.google.com/pubsub/docs

‎branches/tswast-patch-1/pom.xml‎

Lines changed: 25 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.google.gcloud</groupId>
55
<artifactId>gcloud-java</artifactId>
66
<packaging>jar</packaging>
7-
<version>0.0.4</version>
7+
<version>0.0.1</version>
88
<name>GCloud Java</name>
99
<url>https://github.com/GoogleCloudPlatform/gcloud-java</url>
1010
<description>
@@ -49,16 +49,6 @@
4949
</repository>
5050
</distributionManagement>
5151
<dependencies>
52-
<dependency>
53-
<groupId>com.google.auth</groupId>
54-
<artifactId>google-auth-library-credentials</artifactId>
55-
<version>0.1.0</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.google.auth</groupId>
59-
<artifactId>google-auth-library-oauth2-http</artifactId>
60-
<version>0.1.0</version>
61-
</dependency>
6252
<dependency>
6353
<groupId>com.google.http-client</groupId>
6454
<artifactId>google-http-client</artifactId>
@@ -79,7 +69,7 @@
7969
<dependency>
8070
<groupId>com.google.apis</groupId>
8171
<artifactId>google-api-services-datastore-protobuf</artifactId>
82-
<version>v1beta2-rev1-2.1.2</version>
72+
<version>v1beta2-rev1-2.1.0</version>
8373
<scope>compile</scope>
8474
</dependency>
8575
<dependency>
@@ -166,26 +156,6 @@
166156
</pluginRepositories>
167157
<build>
168158
<plugins>
169-
<plugin>
170-
<groupId>org.codehaus.mojo</groupId>
171-
<artifactId>exec-maven-plugin</artifactId>
172-
<version>1.3.2</version>
173-
<executions>
174-
<execution>
175-
<goals>
176-
<goal>java</goal>
177-
</goals>
178-
</execution>
179-
</executions>
180-
<configuration>
181-
<!--
182-
to get rid of the warning: [WARNING] Warning: killAfter is now deprecated. Do you need it ?
183-
Please comment on MEXEC-6. see: method execute() in
184-
https://github.com/ispringer/exec-maven-plugin/blob/master/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java
185-
-->
186-
<killAfter>-1</killAfter>
187-
</configuration>
188-
</plugin>
189159
<plugin>
190160
<groupId>org.apache.maven.plugins</groupId>
191161
<artifactId>maven-failsafe-plugin</artifactId>
@@ -226,7 +196,6 @@
226196
<source>1.7</source>
227197
<target>1.7</target>
228198
<encoding>UTF-8</encoding>
229-
<compilerArgument>-Xlint:unchecked</compilerArgument>
230199
</configuration>
231200
</plugin>
232201
<plugin>
@@ -262,7 +231,7 @@
262231
<executions>
263232
<execution>
264233
<id>sign-artifacts</id>
265-
<phase>deploy</phase>
234+
<phase>verify</phase>
266235
<goals>
267236
<goal>sign</goal>
268237
</goals>
@@ -271,14 +240,14 @@
271240
</plugin>
272241
<plugin>
273242
<groupId>org.sonatype.plugins</groupId>
274-
<artifactId>nexus-staging-maven-plugin</artifactId>
275-
<version>1.6.3</version>
276-
<extensions>true</extensions>
277-
<configuration>
278-
<serverId>sonatype-nexus-staging</serverId>
279-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
280-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
281-
</configuration>
243+
<artifactId>nexus-staging-maven-plugin</artifactId>
244+
<version>1.6.3</version>
245+
<extensions>true</extensions>
246+
<configuration>
247+
<serverId>sonatype-nexus-staging</serverId>
248+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
249+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
250+
</configuration>
282251
</plugin>
283252
<plugin>
284253
<groupId>org.eluder.coveralls</groupId>
@@ -300,11 +269,8 @@
300269
<includes>
301270
<include>com/google/gcloud/**/*.class</include>
302271
</includes>
303-
<excludes>
304-
<exclude>com/google/gcloud/examples/**/*.class</exclude>
305-
</excludes>
306272
</instrumentation>
307-
<check/>
273+
<check />
308274
<maxmem>256m</maxmem>
309275
</configuration>
310276
</plugin>
@@ -327,7 +293,7 @@
327293
<configuration>
328294
<reportPlugins>
329295
<plugin>
330-
<groupId>org.apache.maven.plugins</groupId>
296+
<groupId>org.apache.maven.plugins</groupId>
331297
<artifactId>maven-changelog-plugin</artifactId>
332298
<version>2.3</version>
333299
</plugin>
@@ -336,21 +302,21 @@
336302
<artifactId>maven-project-info-reports-plugin</artifactId>
337303
<version>2.8</version>
338304
<reportSets>
339-
<reportSet>
340-
<reports>
341-
<report>dependencies</report>
342-
<report>project-team</report>
343-
<report>mailing-list</report>
344-
<report>cim</report>
345-
<report>issue-tracking</report>
346-
<report>license</report>
347-
<report>scm</report>
348-
<report>distribution-management</report>
349-
<report>summary</report>
305+
<reportSet>
306+
<reports>
307+
<report>dependencies</report>
308+
<report>project-team</report>
309+
<report>mailing-list</report>
310+
<report>cim</report>
311+
<report>issue-tracking</report>
312+
<report>license</report>
313+
<report>scm</report>
314+
<report>distribution-management</report>
315+
<report>summary</report>
350316
</reports>
351317
</reportSet>
352318
</reportSets>
353-
<configuration>
319+
<configuration>
354320
<quiet>true</quiet>
355321
<dependencyDetailsEnabled>true</dependencyDetailsEnabled>
356322
<dependencyLocationsEnabled>true</dependencyLocationsEnabled>
@@ -412,27 +378,6 @@
412378
</execution>
413379
</executions>
414380
</plugin>
415-
<plugin>
416-
<groupId>org.apache.maven.plugins</groupId>
417-
<artifactId>maven-assembly-plugin</artifactId>
418-
<version>2.4.1</version>
419-
<configuration>
420-
<!-- get all project dependencies -->
421-
<descriptorRefs>
422-
<descriptorRef>jar-with-dependencies</descriptorRef>
423-
</descriptorRefs>
424-
</configuration>
425-
<executions>
426-
<execution>
427-
<id>make-assembly</id>
428-
<!-- bind to the packaging phase -->
429-
<phase>package</phase>
430-
<goals>
431-
<goal>single</goal>
432-
</goals>
433-
</execution>
434-
</executions>
435-
</plugin>
436381
</plugins>
437382
</build>
438383
</project>

0 commit comments

Comments
 (0)