Skip to content

Commit e120d46

Browse files
mziccardmziccard
committed
---
yaml --- r: 4137 b: refs/heads/gcs-nio c: d97c188 h: refs/heads/master i: 4135: 4fa3bb3
1 parent 744f70a commit e120d46

115 files changed

Lines changed: 1045 additions & 10790 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
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
1111
refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
1212
refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
1313
refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
14-
refs/heads/gcs-nio: 17442b07867021b85d0452f5f3eda29a3413288f
14+
refs/heads/gcs-nio: d97c1887f4e24d1b9e03a3743d8481594041cede
1515
refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
1616
refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
1717
refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0

‎branches/gcs-nio/README.md‎

Lines changed: 4 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ This client supports the following Google Cloud Platform services:
1616

1717
- [Google Cloud BigQuery] (#google-cloud-bigquery-alpha) (Alpha)
1818
- [Google Cloud Datastore] (#google-cloud-datastore)
19-
- [Google Cloud DNS] (#google-cloud-dns-alpha) (Alpha)
2019
- [Google Cloud Resource Manager] (#google-cloud-resource-manager-alpha) (Alpha)
2120
- [Google Cloud Storage] (#google-cloud-storage)
2221

@@ -30,16 +29,16 @@ If you are using Maven, add this to your pom.xml file
3029
<dependency>
3130
<groupId>com.google.gcloud</groupId>
3231
<artifactId>gcloud-java</artifactId>
33-
<version>0.1.4</version>
32+
<version>0.1.5</version>
3433
</dependency>
3534
```
3635
If you are using Gradle, add this to your dependencies
3736
```Groovy
38-
compile 'com.google.gcloud:gcloud-java:0.1.4'
37+
compile 'com.google.gcloud:gcloud-java:0.1.5'
3938
```
4039
If you are using SBT, add this to your dependencies
4140
```Scala
42-
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.4"
41+
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.1.5"
4342
```
4443

4544
Example Applications
@@ -49,10 +48,8 @@ Example Applications
4948
- Read more about using this application on the [`BigQueryExample` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/bigquery/BigQueryExample.html).
5049
- [`Bookshelf`](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/bookshelf) - An App Engine app that manages a virtual bookshelf.
5150
- This app uses `gcloud-java` to interface with Cloud Datastore and Cloud Storage. It also uses Cloud SQL, another Google Cloud Platform service.
52-
- [`DatastoreExample`](./gcloud-java-examples/src/main/java/com/google/gcloud/examples/datastore/DatastoreExample.java) - A simple command line interface for Cloud Datastore
51+
- [`DatastoreExample`](./gcloud-java-examples/src/main/java/com/google/gcloud/examples/datastore/DatastoreExample.java) - A simple command line interface for the Cloud Datastore
5352
- Read more about using this application on the [`DatastoreExample` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/datastore/DatastoreExample.html).
54-
- [`DnsExample`](./gcloud-java-examples/src/main/java/com/google/gcloud/examples/dns/DnsExample.java) - A simple command line interface for Cloud DNS
55-
- Read more about using this application on the [`DnsExample` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/dns/DnsExample.html).
5653
- [`ResourceManagerExample`](./gcloud-java-examples/src/main/java/com/google/gcloud/examples/resourcemanager/ResourceManagerExample.java) - A simple command line interface providing some of Cloud Resource Manager's functionality
5754
- Read more about using this application on the [`ResourceManagerExample` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/resourcemanager/ResourceManagerExample.html).
5855
- [`SparkDemo`](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/managed_vms/sparkjava) - An example of using gcloud-java-datastore from within the SparkJava and App Engine Managed VM frameworks.
@@ -221,71 +218,6 @@ if (entity != null) {
221218
}
222219
```
223220
224-
Google Cloud DNS (Alpha)
225-
----------------------
226-
- [API Documentation][dns-api]
227-
- [Official Documentation][cloud-dns-docs]
228-
229-
*Follow the [activation instructions][cloud-dns-activation] to use the Google Cloud DNS API with your project.*
230-
231-
#### Preview
232-
233-
Here are two code snippets showing simple usage examples from within Compute/App Engine. Note that you must [supply credentials](#authentication) and a project ID if running this snippet elsewhere.
234-
235-
The first snippet shows how to create a zone resource. Complete source code can be found on
236-
[CreateZone.java](./gcloud-java-examples/src/main/java/com/google/gcloud/examples/dns/snippets/CreateZone.java).
237-
238-
```java
239-
import com.google.gcloud.dns.Dns;
240-
import com.google.gcloud.dns.DnsOptions;
241-
import com.google.gcloud.dns.Zone;
242-
import com.google.gcloud.dns.ZoneInfo;
243-
244-
Dns dns = DnsOptions.defaultInstance().service();
245-
String zoneName = "my-unique-zone";
246-
String domainName = "someexampledomain.com.";
247-
String description = "This is a gcloud-java-dns sample zone.";
248-
ZoneInfo zoneInfo = ZoneInfo.of(zoneName, domainName, description);
249-
Zone zone = dns.create(zoneInfo);
250-
```
251-
252-
The second snippet shows how to create records inside a zone. The complete code can be found on [CreateOrUpdateDnsRecords.java](./gcloud-java-examples/src/main/java/com/google/gcloud/examples/dns/snippets/CreateOrUpdateDnsRecords.java).
253-
254-
```java
255-
import com.google.gcloud.dns.ChangeRequest;
256-
import com.google.gcloud.dns.Dns;
257-
import com.google.gcloud.dns.DnsOptions;
258-
import com.google.gcloud.dns.DnsRecord;
259-
import com.google.gcloud.dns.Zone;
260-
261-
import java.util.Iterator;
262-
import java.util.concurrent.TimeUnit;
263-
264-
Dns dns = DnsOptions.defaultInstance().service();
265-
String zoneName = "my-unique-zone";
266-
Zone zone = dns.getZone(zoneName);
267-
String ip = "12.13.14.15";
268-
DnsRecord toCreate = DnsRecord.builder("www.someexampledomain.com.", DnsRecord.Type.A)
269-
.ttl(24, TimeUnit.HOURS)
270-
.addRecord(ip)
271-
.build();
272-
ChangeRequest.Builder changeBuilder = ChangeRequest.builder().add(toCreate);
273-
274-
// Verify that the record does not exist yet.
275-
// If it does exist, we will overwrite it with our prepared record.
276-
Iterator<DnsRecord> recordIterator = zone.listDnsRecords().iterateAll();
277-
while (recordIterator.hasNext()) {
278-
DnsRecord current = recordIterator.next();
279-
if (toCreate.name().equals(current.name()) &&
280-
toCreate.type().equals(current.type())) {
281-
changeBuilder.delete(current);
282-
}
283-
}
284-
285-
ChangeRequest changeRequest = changeBuilder.build();
286-
zone.applyChangeRequest(changeRequest);
287-
```
288-
289221
Google Cloud Resource Manager (Alpha)
290222
----------------------
291223
@@ -427,10 +359,6 @@ Apache 2.0 - See [LICENSE] for more information.
427359
[cloud-datastore-activation]: https://cloud.google.com/datastore/docs/activate
428360
[datastore-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/datastore/package-summary.html
429361
430-
[dns-api]: http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/dns/package-summary.html
431-
[cloud-dns-docs]: https://cloud.google.com/dns/docs
432-
[cloud-dns-activation]: https://console.cloud.google.com/start/api?id=dns
433-
434362
[cloud-pubsub]: https://cloud.google.com/pubsub/
435363
[cloud-pubsub-docs]: https://cloud.google.com/pubsub/docs
436364

‎branches/gcs-nio/gcloud-java-bigquery/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
2222
<dependency>
2323
<groupId>com.google.gcloud</groupId>
2424
<artifactId>gcloud-java-bigquery</artifactId>
25-
<version>0.1.4</version>
25+
<version>0.1.5</version>
2626
</dependency>
2727
```
2828
If you are using Gradle, add this to your dependencies
2929
```Groovy
30-
compile 'com.google.gcloud:gcloud-java-bigquery:0.1.4'
30+
compile 'com.google.gcloud:gcloud-java-bigquery:0.1.5'
3131
```
3232
If you are using SBT, add this to your dependencies
3333
```Scala
34-
libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.4"
34+
libraryDependencies += "com.google.gcloud" % "gcloud-java-bigquery" % "0.1.5"
3535
```
3636

3737
Example Application
@@ -185,7 +185,7 @@ Then add the following code to run the query and wait for the result:
185185
QueryRequest queryRequest =
186186
QueryRequest.builder("SELECT * FROM my_dataset_id.my_table_id")
187187
.maxWaitTime(60000L)
188-
.maxResults(1000L)
188+
.pageSize(1000L)
189189
.build();
190190
// Request query to be executed and wait for results
191191
QueryResponse queryResponse = bigquery.query(queryRequest);

‎branches/gcs-nio/gcloud-java-bigquery/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>com.google.gcloud</groupId>
1212
<artifactId>gcloud-java-pom</artifactId>
13-
<version>0.1.5-SNAPSHOT</version>
13+
<version>0.1.6-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<site.installationModule>gcloud-java-bigquery</site.installationModule>

0 commit comments

Comments
 (0)